[Telepathy-commits] [telepathy-mission-control/master] Be ready to call RemoveFailedRequest in any case

[Alberto Mardegan]

We can not wait for AddRequest to return, because the request might fail during
that time, and we wouldn't notify the client. Instead, be ready to call
RemoveFailedRequest since immediately after having called AddRequest.
---
 src/mcd-dispatcher.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index fa0120f..43cd7b8 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2966,7 +2966,6 @@ add_request_cb (TpProxy *proxy, const GError *error, gpointer user_data,
                 GObject *weak_object)
 {
     McdChannel *channel = MCD_CHANNEL (user_data);
-    McdRemoveRequestData *rrd;
 
     if (error)
     {
@@ -2974,17 +2973,6 @@ add_request_cb (TpProxy *proxy, const GError *error, gpointer user_data,
                    _mcd_channel_get_request_path (channel), error->message);
         return;
     }
-
-    rrd = g_slice_new (McdRemoveRequestData);
-    /* store the request path, because it might not be available when the
-     * channel status changes */
-    rrd->request_path = g_strdup (_mcd_channel_get_request_path (channel));
-    rrd->handler = proxy;
-    g_object_ref (proxy);
-    /* we must watch whether the request fails and in that case call
-     * RemoveFailedRequest */
-    g_signal_connect (channel, "status-changed",
-                      G_CALLBACK (on_request_status_changed), rrd);
 }
 
 /*
@@ -3010,6 +2998,7 @@ _mcd_dispatcher_add_request (McdDispatcher *dispatcher, McdAccount *account,
     GPtrArray *requests;
     GHashTableIter iter;
     McdClient *client;
+    McdRemoveRequestData *rrd;
 
     g_return_if_fail (MCD_IS_DISPATCHER (dispatcher));
     g_return_if_fail (MCD_IS_CHANNEL (channel));
@@ -3077,6 +3066,18 @@ _mcd_dispatcher_add_request (McdDispatcher *dispatcher, McdAccount *account,
 
     g_hash_table_unref (properties);
     g_ptr_array_free (requests, TRUE);
+
+    /* Prepare for a RemoveFailedRequest */
+    rrd = g_slice_new (McdRemoveRequestData);
+    /* store the request path, because it might not be available when the
+     * channel status changes */
+    rrd->request_path = g_strdup (_mcd_channel_get_request_path (channel));
+    rrd->handler = handler->proxy;
+    g_object_ref (handler->proxy);
+    /* we must watch whether the request fails and in that case call
+     * RemoveFailedRequest */
+    g_signal_connect (channel, "status-changed",
+                      G_CALLBACK (on_request_status_changed), rrd);
 }
 
 /*
-- 
1.5.6.5