[gnome-session] xsmp: Re-accept clients if session shutdown is cancelled

[Ray Strode <halfline src gnome org>]

commit 42356904ef974ca8376158dddd3d36f913f793a0
Author: Michael Chapman <gnome-bugzilla very puzzling org>
Date:   Wed Feb 6 00:22:00 2013 +0000

    xsmp: Re-accept clients if session shutdown is cancelled
    
    This commit makes sure that gnome-session will accept XSMP
    clients again after a user cancels shutdown.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=691513

 gnome-session/gsm-manager.c     |    1 +
 gnome-session/gsm-xsmp-server.c |    8 ++++++++
 gnome-session/gsm-xsmp-server.h |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 27272bd..941265a 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -1521,6 +1521,7 @@ start_phase (GsmManager *manager)
                                  "MESSAGE=Entering running state",
                                  NULL);
 #endif
+                gsm_xsmp_server_start_accepting_new_clients (manager->priv->xsmp_server);
                 g_signal_emit (manager, signals[SESSION_RUNNING], 0);
                 update_idle (manager);
                 break;
diff --git a/gnome-session/gsm-xsmp-server.c b/gnome-session/gsm-xsmp-server.c
index 53adbf0..e7758f8 100644
--- a/gnome-session/gsm-xsmp-server.c
+++ b/gnome-session/gsm-xsmp-server.c
@@ -256,6 +256,14 @@ gsm_xsmp_server_stop_accepting_new_clients (GsmXsmpServer *server)
         server->priv->stopping = TRUE;
 }
 
+void
+gsm_xsmp_server_start_accepting_new_clients (GsmXsmpServer *server)
+{
+        g_return_if_fail (GSM_IS_XSMP_SERVER (server));
+        g_debug ("gsm_xsmp_server_start");
+        server->priv->stopping = FALSE;
+}
+
 static void
 gsm_xsmp_server_set_client_store (GsmXsmpServer *xsmp_server,
                                   GsmStore      *store)
diff --git a/gnome-session/gsm-xsmp-server.h b/gnome-session/gsm-xsmp-server.h
index 391014d..dc648ca 100644
--- a/gnome-session/gsm-xsmp-server.h
+++ b/gnome-session/gsm-xsmp-server.h
@@ -53,6 +53,7 @@ GType               gsm_xsmp_server_get_type                       (void);
 GsmXsmpServer *     gsm_xsmp_server_new                            (GsmStore      *client_store);
 void                gsm_xsmp_server_start                          (GsmXsmpServer *server);
 void                gsm_xsmp_server_stop_accepting_new_clients     (GsmXsmpServer *server);
+void                gsm_xsmp_server_start_accepting_new_clients    (GsmXsmpServer *server);
 
 G_END_DECLS