[caja] 01/02: debian/patches: Add 0001_return_custom_icons.patch. Make caja_file_get_gicon() return custom icons so that the Folder Color extension now works when Caja is in List View. (LP: #1442681)

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch ubuntu/zesty
in repository caja.

commit 13a2f8b0d6357f286865ec6704afc42ad3e90458
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Thu Apr 20 10:57:43 2017 +0100

    debian/patches: Add 0001_return_custom_icons.patch. Make caja_file_get_gicon() return custom icons so that the Folder Color extension now works when Caja is in List View. (LP: #1442681)
---
 debian/patches/0001_return_custom_icons.patch | 29 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/0001_return_custom_icons.patch b/debian/patches/0001_return_custom_icons.patch
new file mode 100644
index 0000000..bc38e19
--- /dev/null
+++ b/debian/patches/0001_return_custom_icons.patch
@@ -0,0 +1,29 @@
+From 91102344d946f5de702a0323a5c8a4f0789553ce Mon Sep 17 00:00:00 2001
+From: monsta <monsta at inbox.ru>
+Date: Wed, 19 Apr 2017 22:01:13 +0300
+Subject: [PATCH] file: make caja_file_get_gicon return custom icons too
+
+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(+)
+
+diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
+index 6e6603b..2ea025e 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;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5b6ff52..397f693 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0000_do-not-show-property-browser-in-menu.patch
+0001_return_custom_icons.patch
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git