[gdm/wip/wayland: 6/10] daemon: only stop X server when stopping slave if greeter running

[Ray Strode <halfline src gnome org>]

commit 3fc2657b7e805bad6e6a633752687b665917bc52
Author: Ray Strode <rstrode redhat com>
Date:   Tue Sep 17 23:35:20 2013 -0400

    daemon: only stop X server when stopping slave if greeter running
    
    Eventually, it would be nice if we could kill the slave as soon
    as the login screen was finished.
    
    This is a first step toward that goal.

 daemon/gdm-server.c       |    2 --
 daemon/gdm-simple-slave.c |    6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index d43ff68..4861c5b 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -1057,8 +1057,6 @@ gdm_server_finalize (GObject *object)
         if (server->priv->sigusr1_id > 0)
                 g_source_remove (server->priv->sigusr1_id);
 
-        gdm_server_stop (server);
-
         g_free (server->priv->command);
         g_free (server->priv->user_name);
         g_free (server->priv->session_args);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index eacbd5e..94e1b5b 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -966,6 +966,7 @@ static gboolean
 gdm_simple_slave_stop (GdmSlave *slave)
 {
         GdmSimpleSlave *self = GDM_SIMPLE_SLAVE (slave);
+        gboolean stop_server = FALSE;
 
         g_debug ("GdmSimpleSlave: Stopping simple_slave");
 
@@ -974,10 +975,13 @@ gdm_simple_slave_stop (GdmSlave *slave)
         if (self->priv->greeter_environment != NULL) {
                 stop_greeter (self);
                 self->priv->greeter_environment = NULL;
+                stop_server = TRUE;
         }
 
         if (self->priv->server != NULL) {
-                gdm_server_stop (self->priv->server);
+                if (stop_server) {
+                        gdm_server_stop (self->priv->server);
+                }
                 g_clear_object (&self->priv->server);
         }