From 270bdcc5bb28bef06e02f5feabe2ac5a6b10b86a Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 20 Apr 2017 12:55:44 +0300 Subject: 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 --- libcaja-private/caja-file.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libcaja-private') 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; -- cgit v1.2.1