Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@marcopg.org>2008-11-29 12:56:13 (GMT)
committer Marco Pesenti Gritti <marco@marcopg.org>2008-11-29 12:56:13 (GMT)
commit10fa6ae4c5a7d35574072ab5a4a638775a303fdb (patch)
tree0097bfa1d4d942a903c681aadfc9ff1c751ad722 /src
parent0157f427ab3e8ab8c4cb7fb5cbf6655dceee2735 (diff)
Emit the completed signal on shutdown completion, not on client
disconnection. When shutting down with no activity running we was not hitting completion. Fix #11
Diffstat (limited to 'src')
-rw-r--r--src/sugar/gsm-session.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sugar/gsm-session.c b/src/sugar/gsm-session.c
index 3f0714c..b1f4f0e 100644
--- a/src/sugar/gsm-session.c
+++ b/src/sugar/gsm-session.c
@@ -373,6 +373,8 @@ session_shutdown (GsmSession *session)
/* FIXME: do this in reverse phase order */
for (cl = session->clients; cl; cl = cl->next)
gsm_client_die (cl->data);
+
+ g_signal_emit (session, signals[SHUTDOWN_COMPLETED], 0);
}
static void
@@ -485,9 +487,6 @@ client_disconnected (GsmClient *client, gpointer data)
}
g_object_unref (client);
-
- if (session->phase == GSM_SESSION_PHASE_SHUTDOWN && !session->clients)
- g_signal_emit (session, signals[SHUTDOWN_COMPLETED], 0);
}
GsmSession *