[Commits] sugar-toolkit branch master updated.

[Marco Pesenti Gritti]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/sugar-toolkit".

The branch, master has been updated
       via  5a0f5757183ddb9df55552af4a8524b96062730a (commit)
       via  10fa6ae4c5a7d35574072ab5a4a638775a303fdb (commit)
      from  feeeff34a1f89141b06634e47be2787d737c9b3a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 src/sugar/gsm-session.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 5a0f5757183ddb9df55552af4a8524b96062730a
Merge: 10fa6ae... feeeff3...
Author: Marco Pesenti Gritti <marco at marcopg.org>
Date:   Sat Nov 29 13:57:57 2008 +0100

    Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit

commit 10fa6ae4c5a7d35574072ab5a4a638775a303fdb
Author: Marco Pesenti Gritti <marco at marcopg.org>
Date:   Sat Nov 29 13:56:13 2008 +0100

    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

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 *
-----------------------------------------------------------------------


--
/home/olpc-code/git/sugar-toolkit