summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-05-17 15:40:34 -0400
committerRay Strode <rstrode@redhat.com>2012-04-13 17:05:09 -0400
commit88b7118deee192d67086f76e86a11706a9ac7793 (patch)
treec07e63e0f85f9a308605e50fd0e5190edc138df1
parentf81c0e0b518a82c947ee2a38440aa908c362af60 (diff)
downloadgdm-88b7118deee192d67086f76e86a11706a9ac7793.tar.gz
Add a separate .session file for the setup session
Call it gdm-setup.session.
-rw-r--r--daemon/gdm-setup-session.c2
-rw-r--r--data/Makefile.am2
-rw-r--r--data/gdm-setup.session3
3 files changed, 5 insertions, 2 deletions
diff --git a/daemon/gdm-setup-session.c b/daemon/gdm-setup-session.c
index 2f1e3b79..dfbf0f9e 100644
--- a/daemon/gdm-setup-session.c
+++ b/daemon/gdm-setup-session.c
@@ -145,7 +145,7 @@ gdm_setup_session_new (const char *display_name,
GObject *object;
object = g_object_new (GDM_TYPE_SETUP_SESSION,
- "command", BINDIR "/gnome-session --session gdm",
+ "command", BINDIR "/gnome-session --session gdm-setup",
"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/Makefile.am b/data/Makefile.am
index f0d00bf1..1410c87a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -86,7 +86,7 @@ localealiasdir = $(datadir)/gdm
localealias_DATA = locale.alias
sessiondir = $(datadir)/gnome-session/sessions
-session_DATA = gdm-fallback.session gdm-shell.session
+session_DATA = gdm-fallback.session gdm-shell.session gdm-setup.session
gdm-fingerprint: gdm-fingerprint.pam
cp $(srcdir)/gdm-fingerprint.pam $(builddir)/gdm-fingerprint
diff --git a/data/gdm-setup.session b/data/gdm-setup.session
new file mode 100644
index 00000000..c4c07184
--- /dev/null
+++ b/data/gdm-setup.session
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=Display Manager
+RequiredComponents=gnome-shell;gdm-initial-setup;gnome-settings-daemon;gnome-keyring-secrets;nm-applet;