[gdm/wip/initial-setup] Add a separate .session file for the setup session

[Matthias Clasen <matthiasc src gnome org>]

commit a24e71c22cf645cc9ee5b231604e37040a3257f5
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 17 15:40:34 2011 -0400

    Add a separate .session file for the setup session
    
    Call it gdm-setup.session.
    Also, rename the greeter .session file to gdm-greeter.session
    for consistency.

 daemon/gdm-greeter-session.c              |    2 +-
 daemon/gdm-setup-session.c                |    2 +-
 data/{gdm.session => gdm-greeter.session} |    0
 data/{gdm.session => gdm-setup.session}   |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index a401508..bf1f84a 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -148,7 +148,7 @@ gdm_greeter_session_new (const char *display_name,
         GObject *object;
 
         object = g_object_new (GDM_TYPE_GREETER_SESSION,
-                               "command", BINDIR "/gnome-session --session gdm --autostart="DATADIR"/gdm/autostart/LoginWindow/",
+                               "command", BINDIR "/gnome-session --session gdm-greeter --autostart="DATADIR"/gdm/autostart/LoginWindow/",
                                "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/daemon/gdm-setup-session.c b/daemon/gdm-setup-session.c
index e85d025..793404a 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 --autostart="DATADIR"/gdm/autostart/InitialSetup/",
+                               "command", BINDIR "/gnome-session --session gdm-setup --autostart="DATADIR"/gdm/autostart/InitialSetup/",
                                "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/gdm.session b/data/gdm-greeter.session
similarity index 100%
copy from data/gdm.session
copy to data/gdm-greeter.session
diff --git a/data/gdm.session b/data/gdm-setup.session
similarity index 52%
rename from data/gdm.session
rename to data/gdm-setup.session
index 2a74640..43ca9e3 100644
--- a/data/gdm.session
+++ b/data/gdm-setup.session
@@ -1,5 +1,5 @@
 [GNOME Session]
 Name=Display Manager
-RequiredComponents=gdm-simple-greeter;gnome-settings-daemon;polkit-gnome-authentication-agent-1;
+RequiredComponents=gdm-initial-setup;gnome-settings-daemon;polkit-gnome-authentication-agent-1;
 RequiredProviders=windowmanager;
 DefaultProvider-windowmanager=metacity