[Telepathy-commits] [telepathy-mission-control/master] Wait for connection to be ready before dispatching channels

[Alberto Mardegan]

Don't dispatch incoming channels until the connection is ready.
---
 src/mcd-channel.h    |    2 ++
 src/mcd-connection.c |   45 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index 89fcea4..e165343 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -47,6 +47,8 @@ typedef struct _McdChannelClass McdChannelClass;
 
 typedef enum
 {
+    MCD_CHANNEL_UNDISPATCHED, /* used for channels created in the NewChannel
+                                 signal before the connection is ready */
     MCD_CHANNEL_PENDING,     /* Telepathy channel is not yet created */
     MCD_CHANNEL_DISPATCHING, /* Telepathy channel is created and waiting dispatch */
     MCD_CHANNEL_DISPATCHED,  /* Channel has been dispatched to handler */
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 24d523b..0149a6d 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -106,6 +106,9 @@ struct _McdConnectionPrivate
     gboolean has_alias_if : 1;
     gboolean has_capabilities_if : 1;
 
+    /* FALSE until the connection is ready for dispatching */
+    gboolean can_dispatch : 1;
+
     gchar *alias;
 
     gboolean is_disposed;
@@ -580,11 +583,16 @@ on_new_channel (TpConnection *proxy, const gchar *chan_obj_path,
     mcd_operation_take_mission (MCD_OPERATION (connection),
 				MCD_MISSION (channel));
 
-    /* Channel about to be dispatched */
-    mcd_channel_set_status (channel, MCD_CHANNEL_DISPATCHING);
-    
-    /* Dispatch the incoming channel */
-    mcd_dispatcher_send (priv->dispatcher, channel);
+    if (priv->can_dispatch)
+    {
+        /* Channel about to be dispatched */
+        mcd_channel_set_status (channel, MCD_CHANNEL_DISPATCHING);
+
+        /* Dispatch the incoming channel */
+        mcd_dispatcher_send (priv->dispatcher, channel);
+    }
+    else
+        mcd_channel_set_status (channel, MCD_CHANNEL_UNDISPATCHED);
 }
 
 static void
@@ -1245,6 +1253,31 @@ connect_cb (TpConnection *tp_conn, const GError *error,
 }
 
 static void
+dispatch_undispatched_channels (McdConnection *connection)
+{
+    McdConnectionPrivate *priv = connection->priv;
+    const GList *channels;
+
+    priv->can_dispatch = TRUE;
+    channels = mcd_operation_get_missions ((McdOperation *)connection);
+
+    g_debug ("%s called", G_STRFUNC);
+    while (channels)
+    {
+	McdChannel *channel = MCD_CHANNEL (channels->data);
+
+        if (mcd_channel_get_status (channel) == MCD_CHANNEL_UNDISPATCHED)
+        {
+            g_debug ("Dispatching channel %p", channel);
+            /* dispatch the channel */
+            mcd_channel_set_status (channel, MCD_CHANNEL_DISPATCHING);
+            mcd_dispatcher_send (priv->dispatcher, channel);
+        }
+        channels = channels->next;
+    }
+}
+
+static void
 on_connection_ready (TpConnection *tp_conn, const GError *error,
 		     gpointer user_data)
 {
@@ -1287,6 +1320,8 @@ on_connection_ready (TpConnection *tp_conn, const GError *error,
 
     if (priv->has_alias_if)
 	_mcd_connection_setup_alias (connection);
+
+    dispatch_undispatched_channels (connection);
 }
 
 static void
-- 
1.5.6.5