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

Proposed by Tim Lunn on 2014-10-15
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~darkxst/gnome-session/lp1381297
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 30 lines (+12/-0)
2 files modified
debian/changelog (+6/-0)
debian/gnome-session-bin.user-session.upstart (+6/-0)
To merge this branch: bzr merge lp:~darkxst/gnome-session/lp1381297
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2014-10-15 Pending
Review via email: mp+238373@code.launchpad.net
To post a comment you must log in.
lp:~darkxst/gnome-session/lp1381297 updated on 2014-10-15
317. By Tim Lunn on 2014-10-15

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-30 17:01:54 +0000
3+++ debian/changelog 2014-10-15 10:14:25 +0000
4@@ -1,3 +1,9 @@
5+gnome-session (3.9.90-0ubuntu16) UNRELEASED; urgency=medium
6+
7+ * set GNOME_SHELL_SESSION_MODE for gnome-classic sessions (LP: #1381297)
8+
9+ -- Tim Lunn <tim@feathertop.org> Wed, 15 Oct 2014 13:36:08 +1100
10+
11 gnome-session (3.9.90-0ubuntu15) utopic; urgency=medium
12
13 * No change rebuild for gnome-desktop 3.12
14
15=== modified file 'debian/gnome-session-bin.user-session.upstart'
16--- debian/gnome-session-bin.user-session.upstart 2014-06-20 10:18:20 +0000
17+++ debian/gnome-session-bin.user-session.upstart 2014-10-15 10:14:25 +0000
18@@ -10,6 +10,12 @@
19 emits desktop-end
20
21 script
22+
23+# Gnome-classic session requires this env to be exported
24+if [ "x$DESKTOP_SESSION" = "xgnome-classic" ] ; then
25+ export GNOME_SHELL_SESSION_MODE=classic
26+fi
27+
28 unset UPSTART_EVENTS UPSTART_INSTANCE UPSTART_JOB
29 exec gnome-session --session=$DESKTOP_SESSION
30 end script

Subscribers

People subscribed via source and target branches

to all changes: