[caja] 01/01: Drop 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository caja.

commit 5173b19a11c029124ea460478c2b5d9b6a601697
Author: Martin Wimpress <code at flexion.org>
Date:   Wed Jun 10 22:28:55 2015 +0100

    Drop 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Applied upstream.
---
 ...nt-start-desktop-outside-of-MATE-sessions.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch b/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch
deleted file mode 100644
index b683781..0000000
--- a/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 23b75dadd35f039a8cd93111528a8a66dde8888e Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Wed, 21 Jan 2015 14:53:39 +0100
-Subject: [PATCH] Disable desktop if we arent inside MATE
-
----
- src/caja-main.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/caja-main.c
-+++ b/src/caja-main.c
-@@ -467,6 +467,10 @@
-         no_default_window = TRUE;
-         no_desktop = FALSE;
-     }
-+    else if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") != 0)
-+    {
-+        no_desktop = TRUE;
-+    }
- 
-     if (perform_self_check && remaining != NULL)
-     {
diff --git a/debian/patches/series b/debian/patches/series
index 7bf2231..d1c3b7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002_dont-start-desktop-outside-of-MATE-sessions.patch
 0004_avoid-automounts-while-screen-is-locked.patch

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