[caja] 01/03: debian/patches: Drop 0001_return_custom_icons.patch. Applied upstream.

[Martin Wimpress]

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

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

commit e701787f49dd92700f2d8296fc06989e5072d383
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Thu May 11 07:50:42 2017 +0100

    debian/patches: Drop 0001_return_custom_icons.patch. Applied upstream.
---
 debian/patches/0001_return_custom_icons.patch | 29 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/0001_return_custom_icons.patch b/debian/patches/0001_return_custom_icons.patch
deleted file mode 100644
index bc38e19..0000000
--- a/debian/patches/0001_return_custom_icons.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 397f693..5b6ff52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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