diff options
| author | monsta <[email protected]> | 2017-04-20 12:55:44 +0300 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2017-04-20 10:55:44 +0100 |
| commit | 44584d2eee219d9b7db82ed81072b84609837128 (patch) | |
| tree | ca8a262652e532d10ed07f54e2547b901746d9fc | |
| parent | 26a0aa2823f6411916f5ad37437bb797cf2cff26 (diff) | |
| download | caja-44584d2eee219d9b7db82ed81072b84609837128.tar.bz2 caja-44584d2eee219d9b7db82ed81072b84609837128.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
| -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 6e6603b2..2ea025e4 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -4123,6 +4123,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; |