Commit 42356904 authored by Michael Chapman's avatar Michael Chapman Committed by Ray Strode

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
parent 4c7e1c86
......@@ -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;
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment