Merge lp:~darkxst/gnome-session/lp1381297 into lp:~ubuntu-desktop/gnome-session/ubuntu

[Tim Lunn]

[lp:~darkxst/gnome-session/lp1381297]

317. By Tim Lunn on 2014-10-15

set GNOME_SHELL_SESSION_MODE for gnome-classic sessions (LP: #1381297)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-30 17:01:54 +0000
+++ debian/changelog	2014-10-15 10:14:25 +0000
@@ -1,3 +1,9 @@
+gnome-session (3.9.90-0ubuntu16) UNRELEASED; urgency=medium
+
+  * set GNOME_SHELL_SESSION_MODE for gnome-classic sessions (LP: #1381297)
+ 
+ -- Tim Lunn <[e-mail]>  Wed, 15 Oct 2014 13:36:08 +1100
+
 gnome-session (3.9.90-0ubuntu15) utopic; urgency=medium
 
   * No change rebuild for gnome-desktop 3.12
 
=== modified file 'debian/gnome-session-bin.user-session.upstart'
--- debian/gnome-session-bin.user-session.upstart	2014-06-20 10:18:20 +0000
+++ debian/gnome-session-bin.user-session.upstart	2014-10-15 10:14:25 +0000
@@ -10,6 +10,12 @@
 emits desktop-end
 
 script
+	
+# Gnome-classic session requires this env to be exported
+if [ "x$DESKTOP_SESSION" = "xgnome-classic" ] ; then
+    export GNOME_SHELL_SESSION_MODE=classic
+fi
+
 unset UPSTART_EVENTS UPSTART_INSTANCE UPSTART_JOB
 exec gnome-session --session=$DESKTOP_SESSION
 end script