Merge lp:~robert-ancell/lightdm/xdg-current-desktop-non-autologin into lp:lightdm

[Robert Ancell]

Set XDG_CURRENT_DESKTOP for login sessions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1778
http://jenkins.qa.ubuntu.com/job/lightdm-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/110

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/193/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/seat.c'
--- src/seat.c	2013-08-25 20:46:15 +0000
+++ src/seat.c	2013-09-09 03:25:20 +0000
@@ -929,7 +929,7 @@
 greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat)
 {
     Session *session, *existing_session;
-    const gchar *username, *language = NULL;
+    const gchar *username, *desktop_name, *language = NULL;
     SessionConfig *session_config;
     User *user;
     gchar *sessions_dir = NULL;
@@ -1003,6 +1003,9 @@
     g_strfreev (argv);
     session_set_env (session, "DESKTOP_SESSION", session_name);
     session_set_env (session, "GDMSESSION", session_name);
+    desktop_name = session_config_get_desktop_name (session_config);
+    if (desktop_name)
+        session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
     if (language && language[0] != '\0')
     {
         session_set_env (session, "LANG", language);