[gdm/wip/initial-setup] Only remove the setup request marker file in ::stop

[Matthias Clasen <matthiasc src gnome org>]

commit dbf56bde17ba902182df8337e6c2da4584c97865
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 19 11:49:01 2011 -0400

    Only remove the setup request marker file in ::stop
    
    This way, if the setup session gets interrupted halfway through,
    we'll reenter setup when the system is booted the next time.

 daemon/gdm-simple-slave.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index e5fd8bd..bd0f3d3 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1258,6 +1258,14 @@ start_greeter (GdmSimpleSlave *slave)
 }
 
 static void
+on_setup_session_stop (GdmGreeterSession *greeter,
+                       GdmSimpleSlave    *slave)
+{
+        g_debug ("GdmSimpleSlave: Setup stopped");
+        clear_initial_setup_request (slave);
+        gdm_slave_stopped (GDM_SLAVE (slave));
+}
+static void
 start_initial_setup (GdmSimpleSlave *slave)
 {
         gboolean       display_is_local;
@@ -1374,7 +1382,7 @@ start_initial_setup (GdmSimpleSlave *slave)
                           slave);
         g_signal_connect (slave->priv->greeter,
                           "stopped",
-                          G_CALLBACK (on_greeter_session_stop),
+                          G_CALLBACK (on_setup_session_stop),
                           slave);
         g_signal_connect (slave->priv->greeter,
                           "exited",
@@ -1453,7 +1461,6 @@ idle_connect_to_display (GdmSimpleSlave *slave)
                 timed_login_enabled = FALSE;
                 gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &timed_login_enabled, NULL, &timed_login_delay);
                 if (initial_setup_enabled && initial_setup_requested) {
-                        clear_initial_setup_request (slave);
                         start_initial_setup (slave);
                         create_new_session (slave);
                 } else if (! timed_login_enabled || timed_login_delay > 0) {