debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch: Applied upstream.

This commit is contained in:
Martin Wimpress 2015-06-12 16:05:58 +01:00
parent b335abdcb4
commit 5bebf00ac3

View File

@ -1,22 +0,0 @@
From ca95cd34c5c6f9f9e5873b4732338e23c30988e8 Mon Sep 17 00:00:00 2001
From: Denis Gorodnichev <denis.gorodnichev@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.
*/