[caja] 02/06: debian/patches: Add 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Stop launching a MATE desktop window when one opens Caja outside a MATE desktop session. (Closes: #771587).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja.

commit 1f2c863e5dcb5ddcc4df7f12e7d3ecdbb49fc3e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jan 21 14:57:32 2015 +0100

    debian/patches: Add 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Stop launching a MATE desktop window when one opens Caja outside a MATE desktop session. (Closes: #771587).
---
 ...nt-start-desktop-outside-of-MATE-sessions.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

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
new file mode 100644
index 0000000..b683781
--- /dev/null
+++ b/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch
@@ -0,0 +1,22 @@
+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 02fba1e..74a7d8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_fix-desktop-icon-size.patch
+0002_dont-start-desktop-outside-of-MATE-sessions.patch

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