summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-04-20 12:55:44 +0300
committermonsta <[email protected]>2017-04-23 16:17:26 +0300
commitecfc8ea6267f5cf87243b9ce8053060b17218d8a (patch)
treed20504b3f84ed1901025a13b9aa0ccd0cd5c61df /libcaja-private
parent767f1043fe60c1f2ccf6037957755d968eddc0aa (diff)
downloadcaja-ecfc8ea6267f5cf87243b9ce8053060b17218d8a.tar.bz2
caja-ecfc8ea6267f5cf87243b9ce8053060b17218d8a.tar.xz
file: make caja_file_get_gicon return custom icons too (#765)
fixes https://github.com/mate-desktop/caja/issues/410 taken from: https://git.gnome.org/browse/nautilus/commit/?id=f1c782c13dd675bafffb2a4d85900da52be88f3f
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-file.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 85f7aa2f..216ae969 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -4132,6 +4132,11 @@ caja_file_get_gicon (CajaFile *file,
return NULL;
}
+ icon = get_custom_icon (file);
+ if (icon != NULL) {
+ return icon;
+ }
+
if (file->details->icon) {
icon = NULL;