[gdm] daemon: Remove GdmGreeterSession and GdmChooserSession

[Ray Strode <halfline src gnome org>]

commit be67db1c11868ea2788cece74bbe53e76522292c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Jul 17 16:09:32 2012 -0400

    daemon: Remove GdmGreeterSession and GdmChooserSession
    
    With the recent cleanup, these two are just dummy class subtypes.
    Duplicating this one more time for the setup session wouldn't be
    worth it. Into the trash it goes.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678057

 daemon/Makefile.am               |    4 --
 daemon/gdm-chooser-session.c     |   89 ---------------------------------
 daemon/gdm-chooser-session.h     |   58 ----------------------
 daemon/gdm-greeter-session.c     |  101 --------------------------------------
 daemon/gdm-greeter-session.h     |   60 ----------------------
 daemon/gdm-simple-slave.c        |   51 +++++++++++++++-----
 daemon/gdm-xdmcp-chooser-slave.c |   28 ++++++++---
 7 files changed, 60 insertions(+), 331 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 59f1167..abf5062 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -144,8 +144,6 @@ gdm_simple_slave_SOURCES = 		\
 	simple-slave-main.c 		\
 	gdm-welcome-session.c		\
 	gdm-welcome-session.h		\
-	gdm-greeter-session.c		\
-	gdm-greeter-session.h		\
 	gdm-server.c			\
 	gdm-server.h			\
 	gdm-session.c			\
@@ -198,8 +196,6 @@ gdm_xdmcp_chooser_slave_SOURCES = 		\
 	gdm-session-worker-job.h		\
 	gdm-welcome-session.c			\
 	gdm-welcome-session.h			\
-	gdm-chooser-session.c			\
-	gdm-chooser-session.h			\
 	gdm-xerrors.h				\
 	gdm-xerrors.c				\
 	gdm-slave.c				\
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 2e400bc..4b9ac11 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -50,7 +50,7 @@
 #include "gdm-server.h"
 #include "gdm-session.h"
 #include "gdm-session-glue.h"
-#include "gdm-greeter-session.h"
+#include "gdm-welcome-session.h"
 #include "gdm-settings-direct.h"
 #include "gdm-settings-keys.h"
 
@@ -77,7 +77,7 @@ struct GdmSimpleSlavePrivate
 
         GdmServer         *server;
         GdmSession        *session;
-        GdmGreeterSession *greeter;
+        GdmWelcomeSession *greeter;
 
         GHashTable        *open_reauthentication_requests;
 
@@ -690,7 +690,7 @@ create_new_session (GdmSimpleSlave  *slave)
 }
 
 static void
-on_greeter_session_opened (GdmGreeterSession *greeter,
+on_greeter_session_opened (GdmWelcomeSession *greeter,
                            GdmSimpleSlave    *slave)
 {
         char       *session_id;
@@ -703,14 +703,14 @@ on_greeter_session_opened (GdmGreeterSession *greeter,
 }
 
 static void
-on_greeter_session_started (GdmGreeterSession *greeter,
+on_greeter_session_started (GdmWelcomeSession *greeter,
                             GdmSimpleSlave    *slave)
 {
         g_debug ("GdmSimpleSlave: Greeter started");
 }
 
 static void
-on_greeter_session_stopped (GdmGreeterSession *greeter,
+on_greeter_session_stopped (GdmWelcomeSession *greeter,
                             GdmSimpleSlave    *slave)
 {
         g_debug ("GdmSimpleSlave: Greeter stopped");
@@ -726,7 +726,7 @@ on_greeter_session_stopped (GdmGreeterSession *greeter,
 }
 
 static void
-on_greeter_session_exited (GdmGreeterSession    *greeter,
+on_greeter_session_exited (GdmWelcomeSession    *greeter,
                            int                   code,
                            GdmSimpleSlave       *slave)
 {
@@ -737,7 +737,7 @@ on_greeter_session_exited (GdmGreeterSession    *greeter,
 }
 
 static void
-on_greeter_session_died (GdmGreeterSession    *greeter,
+on_greeter_session_died (GdmWelcomeSession    *greeter,
                          int                   signal,
                          GdmSimpleSlave       *slave)
 {
@@ -842,6 +842,33 @@ setup_server (GdmSimpleSlave *slave)
 #endif
 }
 
+static GdmWelcomeSession *
+create_greeter_session (const char *display_name,
+                        const char *seat_id,
+                        const char *display_device,
+                        const char *display_hostname,
+                        gboolean    display_is_local)
+{
+        gboolean debug = FALSE;
+        char *command = BINDIR "/gnome-session -f";
+
+        gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug);
+
+        if (debug) {
+                command = BINDIR "/gnome-session -f --debug";
+        }
+
+        return g_object_new (GDM_TYPE_WELCOME_SESSION,
+                             "command", command,
+                             "x11-display-name", display_name,
+                             "x11-display-seat-id", seat_id,
+                             "x11-display-device", display_device,
+                             "x11-display-hostname", display_hostname,
+                             "x11-display-is-local", display_is_local,
+                             "runtime-dir", GDM_SCREENSHOT_DIR,
+                             NULL);
+}
+
 static void
 start_greeter (GdmSimpleSlave *slave)
 {
@@ -894,11 +921,11 @@ start_greeter (GdmSimpleSlave *slave)
         gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
 
         g_debug ("GdmSimpleSlave: Creating greeter on %s %s %s", display_name, display_device, display_hostname);
-        slave->priv->greeter = gdm_greeter_session_new (display_name,
-                                                        seat_id,
-                                                        display_device,
-                                                        display_hostname,
-                                                        display_is_local);
+        slave->priv->greeter = create_greeter_session (display_name,
+                                                       seat_id,
+                                                       display_device,
+                                                       display_hostname,
+                                                       display_is_local);
         g_signal_connect (slave->priv->greeter,
                           "opened",
                           G_CALLBACK (on_greeter_session_opened),
diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c
index 17ce057..51043e0 100644
--- a/daemon/gdm-xdmcp-chooser-slave.c
+++ b/daemon/gdm-xdmcp-chooser-slave.c
@@ -42,7 +42,7 @@
 #include "gdm-xdmcp-chooser-slave-glue.h"
 
 #include "gdm-server.h"
-#include "gdm-chooser-session.h"
+#include "gdm-welcome-session.h"
 #include "gdm-settings-direct.h"
 #include "gdm-settings-keys.h"
 #include "gdm-session.h"
@@ -64,7 +64,7 @@ struct GdmXdmcpChooserSlavePrivate
 
         guint              connection_attempts;
 
-        GdmChooserSession *chooser;
+        GdmWelcomeSession *chooser;
 
         GdmDBusXdmcpChooserSlave *skeleton;
 };
@@ -77,7 +77,7 @@ G_DEFINE_TYPE (GdmXdmcpChooserSlave, gdm_xdmcp_chooser_slave, GDM_TYPE_SLAVE)
 
 
 static void
-on_chooser_session_opened (GdmChooserSession    *chooser,
+on_chooser_session_opened (GdmWelcomeSession    *chooser,
                            GdmXdmcpChooserSlave *slave)
 {
         char       *session_id;
@@ -90,14 +90,14 @@ on_chooser_session_opened (GdmChooserSession    *chooser,
 }
 
 static void
-on_chooser_session_start (GdmChooserSession    *chooser,
+on_chooser_session_start (GdmWelcomeSession    *chooser,
                           GdmXdmcpChooserSlave *slave)
 {
         g_debug ("GdmXdmcpChooserSlave: Chooser started");
 }
 
 static void
-on_chooser_session_stop (GdmChooserSession    *chooser,
+on_chooser_session_stop (GdmWelcomeSession    *chooser,
                          GdmXdmcpChooserSlave *slave)
 {
         g_debug ("GdmXdmcpChooserSlave: Chooser stopped");
@@ -108,7 +108,7 @@ on_chooser_session_stop (GdmChooserSession    *chooser,
 }
 
 static void
-on_chooser_session_exited (GdmChooserSession    *chooser,
+on_chooser_session_exited (GdmWelcomeSession    *chooser,
                            int                   code,
                            GdmXdmcpChooserSlave *slave)
 {
@@ -120,7 +120,7 @@ on_chooser_session_exited (GdmChooserSession    *chooser,
 }
 
 static void
-on_chooser_session_died (GdmChooserSession    *chooser,
+on_chooser_session_died (GdmWelcomeSession    *chooser,
                          int                   signal,
                          GdmXdmcpChooserSlave *slave)
 {
@@ -169,6 +169,20 @@ setup_server (GdmXdmcpChooserSlave *slave)
         gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
 }
 
+static GdmWelcomeSession *
+create_chooser_session (const char *display_name,
+                        const char *display_device,
+                        const char *display_hostname)
+{
+        return g_object_new (GDM_TYPE_WELCOME_SESSION,
+                             "command", LIBEXECDIR "/gdm-simple-chooser",
+                             "verification-mode", GDM_SESSION_VERIFICATION_MODE_CHOOSER,
+                             "x11-display-name", display_name,
+                             "x11-display-device", display_device,
+                             "x11-display-hostname", display_hostname,
+                             NULL);
+}
+
 static void
 run_chooser (GdmXdmcpChooserSlave *slave)
 {