Merge lp:~darkxst/ubuntu/saucy/gdm/lp1212408 into lp:ubuntu/saucy/gdm

[Tim Lunn]

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-30 20:04:14 +0000
+++ debian/changelog	2013-08-31 03:04:04 +0000
@@ -1,3 +1,10 @@
+gdm (3.8.4-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/ubuntu_export_XDG_CURRENT_DESKTOP.patch:
+    - Set $XDG_CURRENT_DESKTOP if specified in the xsession file. (LP: #1212408)
+
+ -- Tim Lunn <[e-mail]>  Sat, 31 Aug 2013 13:01:11 +1000
+
 gdm (3.8.4-0ubuntu1) saucy; urgency=low
 
   * New upstream release
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-30 20:04:14 +0000
+++ debian/patches/series	2013-08-31 03:04:04 +0000
@@ -15,3 +15,4 @@
 ubuntu_no_debug.patch
 ubuntu_xresources_is_a_dir.patch
 ubuntu_no_LANG_setting_in_Xsession.patch
+ubuntu_export_XDG_CURRENT_DESKTOP.patch
 
=== added file 'debian/patches/ubuntu_export_XDG_CURRENT_DESKTOP.patch'
--- debian/patches/ubuntu_export_XDG_CURRENT_DESKTOP.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_export_XDG_CURRENT_DESKTOP.patch	2013-08-31 03:04:04 +0000
@@ -0,0 +1,86 @@
+From e6024432a560341ddae5ce6873b2030e6b6c886f Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Sat, 31 Aug 2013 12:12:12 +1000
+Subject: [PATCH] session: export XDG_CURRENT_DESKTOP environment
+
+---
+ daemon/gdm-session.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index d74bed6..26b0c80 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2275,6 +2275,46 @@ get_session_command (GdmSession *self)
+         return command;
+ }
+ 
++char *
++get_session_desktop_name (GdmSession *self)
++{
++        GError     *error;
++        GKeyFile   *key_file;
++        gboolean    res;
++        char       *desktop_name = NULL;
++        char       *filename;
++
++        g_return_val_if_fail (self != NULL, FALSE);
++        g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
++
++        filename = g_strdup_printf ("%s.desktop", get_session_name (self));
++
++        key_file = g_key_file_new ();
++        error = NULL;
++        res = g_key_file_load_from_dirs (key_file,
++                                         filename,
++                                         get_system_session_dirs (),
++                                         NULL,
++                                         G_KEY_FILE_NONE,
++                                         &error);
++        if (! res) {
++                g_debug ("GdmSession: File '%s' not found: %s", filename, error->message);
++                goto out;
++        }
++
++        res = g_key_file_has_key (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
++        if (!res) {
++                goto out;
++        } else {
++                desktop_name = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
++        }
++
++out:
++        g_free (filename);
++        return desktop_name;
++}
++
++
+ void
+ gdm_session_set_environment_variable (GdmSession *self,
+                                       const char *key,
+@@ -2292,6 +2332,7 @@ static void
+ setup_session_environment (GdmSession *self)
+ {
+         const char *locale;
++        const char *desktop_name;
+ 
+         gdm_session_set_environment_variable (self,
+                                               "GDMSESSION",
+@@ -2299,6 +2340,13 @@ setup_session_environment (GdmSession *self)
+         gdm_session_set_environment_variable (self,
+                                               "DESKTOP_SESSION",
+                                               get_session_name (self));
++        desktop_name = get_session_desktop_name (self);
++        if (desktop_name != NULL) {
++                gdm_session_set_environment_variable (self,
++                                                      "XDG_CURRENT_DESKTOP",
++                                                      desktop_name);
++                g_free (desktop_name);
++        }
+ 
+         locale = get_language_name (self);
+ 
+-- 
+1.8.3.2
+
+