diff options
| author | monsta <[email protected]> | 2017-04-20 12:55:44 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2017-04-23 16:35:25 +0300 |
| commit | 270bdcc5bb28bef06e02f5feabe2ac5a6b10b86a (patch) | |
| tree | 622c5595e05a235c06eeb8d0c8739d476ac8d64b /libcaja-private | |
| parent | b4123d435e2c730b3924bf089ec43fdd692dd12d (diff) | |
| download | caja-270bdcc5bb28bef06e02f5feabe2ac5a6b10b86a.tar.bz2 caja-270bdcc5bb28bef06e02f5feabe2ac5a6b10b86a.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.c | 5 |
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; |