diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-09-09 16:23:24 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-09-09 16:23:24 -0400 |
| commit | 23a98ab436bc86431ffd83bfedc5c32cb34faf9e (patch) | |
| tree | 1af6bf6a6195ad9408700c712d35445d68e425dd | |
| parent | 6849f6f3b8a199bed5427b8d6f1e2dedbe035d6c (diff) | |
| download | gdm-23a98ab436bc86431ffd83bfedc5c32cb34faf9e.tar.gz | |
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.
| -rw-r--r-- | daemon/gdm-greeter-session.c | 2 | ||||
| -rwxr-xr-x | 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 9434a520..80320651 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 27d7bab6..638fe1de 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 '""' |