[mate-session-manager] 08/15: debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.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 mate-session-manager.

commit 5bebf00ac303241e29f97011d36f058661005c2a
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Jun 12 16:05:58 2015 +0100

    debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch: Applied upstream.
---
 .../0003_set-XDG-CURRENT-DESKTOP-if-empty.patch    | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch b/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch
deleted file mode 100644
index 54940e4..0000000
--- a/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ca95cd34c5c6f9f9e5873b4732338e23c30988e8 Mon Sep 17 00:00:00 2001
-From: Denis Gorodnichev <denis.gorodnichev at gmail.com>
-Date: Mon, 29 Sep 2014 04:44:00 +0000
-Subject: Set XDG_CURRENT_DESKTOP if unset
-
-XDG_CURRENT_DESKTOP is used by glib >= 2.42 at g_desktop_app_info* functions
-
-Original GNOME commit: https://git.gnome.org/browse/gnome-session/commit/?id=1db085ce7e5197b28ab24a3ec54d888efe98fcb4
-Closes https://github.com/mate-desktop/mate-session-manager/pull/62
----
---- a/mate-session/main.c
-+++ b/mate-session/main.c
-@@ -581,6 +581,9 @@
- 	mdm_log_init();
- 	mdm_log_set_debug(debug);
- 
-+	if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
-+		gsm_util_setenv ("XDG_CURRENT_DESKTOP", "MATE");
-+
- 	/* Set DISPLAY explicitly for all our children, in case --display
- 	 * was specified on the command line.
- 	 */

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