From dc3162d24b372705cea7697624bfd04cee376997 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 7 Jan 2014 13:41:28 -0500
Subject: [PATCH] data: set shell classic mode via env variable instead of
 command line

Currently, we start gnome-shell in classic mode by passing
--mode=classic to the gnome-shell command line. This --mode=classic
gets stripped away when the session is saved, which breaks classic
mode on subsequent login attempts.

This commit changes the session file to set the
GNOME_SHELL_SESSION_MODE environment variable instead.
---
 data/gnome-classic.desktop.in          | 2 +-
 data/gnome-shell-classic.desktop.in.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
index b3ab3af..27ae219 100644
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=GNOME Classic
 _Comment=This session logs you into GNOME Classic
-Exec=gnome-session --session gnome-classic
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Icon=
 Type=Application
diff --git a/data/gnome-shell-classic.desktop.in.in b/data/gnome-shell-classic.desktop.in.in
index 6de19fe..76fdf21 100644
--- a/data/gnome-shell-classic.desktop.in.in
+++ b/data/gnome-shell-classic.desktop.in.in
@@ -1,17 +1,17 @@
 [Desktop Entry]
 Type=Application
 _Name=GNOME Shell Classic
 _Comment=Window management and application launching
-Exec=@bindir@/gnome-shell --mode=classic
+Exec=@bindir@/gnome-shell
 TryExec=@bindir@/gnome-shell
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
-- 
1.8.3.1