[gdm] daemon: don't hard code session name

[Ray Strode <halfline src gnome org>]

commit 23a98ab436bc86431ffd83bfedc5c32cb34faf9e
Author: Ray Strode <rstrode redhat com>
Date:   Fri Sep 9 16:23:24 2011 -0400

    daemon: don't hard code session name
    
    Right now we hard code the session to gdm-shell which
    prevents users from forcing fallback.
    
    This commit changes gnome-session to load the session
    from settings, and changes the default in settings to gdm-shell.

 daemon/gdm-greeter-session.c   |    2 +-
 data/make-dconf-override-db.sh |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index 9434a52..8032065 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -78,7 +78,7 @@ gdm_greeter_session_new (const char *display_name,
         GObject *object;
 
         object = g_object_new (GDM_TYPE_GREETER_SESSION,
-                               "command", BINDIR "/gnome-session -f --debug --session gdm-shell",
+                               "command", BINDIR "/gnome-session -f --debug",
                                "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
                                "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
                                "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
index 27d7bab..638fe1d 100755
--- a/data/make-dconf-override-db.sh
+++ b/data/make-dconf-override-db.sh
@@ -25,6 +25,8 @@ gsettings set org.gnome.desktop.lockdown disable-print-setup true
 gsettings set org.gnome.desktop.lockdown disable-printing true
 gsettings set org.gnome.desktop.lockdown disable-save-to-disk true
 
+gsettings set org.gnome.desktop.session session-name '"gdm-shell"'
+
 gsettings set org.gnome.desktop.sound event-sounds true
 
 gsettings set org.gnome.settings-daemon.plugins.media-keys eject '""'