[telepathy-mission-control/master] _mcd_client_proxy_handle_channels: automatically set MCD_CHANNEL_STATUS_HANDLER_INVOKED

[Simon McVittie]

---
 src/mcd-client.c             |    3 +++
 src/mcd-dispatch-operation.c |    7 -------
 src/mcd-dispatcher.c         |    2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/mcd-client.c b/src/mcd-client.c
index cfecde6..4676a8e 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -1592,6 +1592,9 @@ _mcd_client_proxy_handle_channels (McdClientProxy *self,
 
         if (req_time > user_action_time)
             user_action_time = req_time;
+
+        _mcd_channel_set_status (iter->data,
+                                 MCD_CHANNEL_STATUS_HANDLER_INVOKED);
     }
 
     tp_cli_client_handler_call_handle_channels ((TpClient *) self,
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 47e7c83..cf44cfa 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -1665,16 +1665,9 @@ mcd_dispatch_operation_handle_channels (McdDispatchOperation *self,
 {
     const gchar *account_path;
     GHashTable *handler_info;
-    const GList *cl;
 
     account_path = _mcd_dispatch_operation_get_account_path (self);
 
-    for (cl = self->priv->channels; cl != NULL; cl = cl->next)
-    {
-        _mcd_channel_set_status (cl->data,
-                                 MCD_CHANNEL_STATUS_HANDLER_INVOKED);
-    }
-
     handler_info = g_hash_table_new (g_str_hash, g_str_equal);
 
     DEBUG ("calling HandleChannels on %s for op %p",
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index dc1d058..1ad10a4 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1817,8 +1817,6 @@ _mcd_dispatcher_reinvoke_handler (McdDispatcher *dispatcher,
 
     handler_info = g_hash_table_new (g_str_hash, g_str_equal);
 
-    _mcd_channel_set_status (request, MCD_CHANNEL_STATUS_HANDLER_INVOKED);
-
     _mcd_client_proxy_handle_channels (handler,
         -1, account_path, request_as_list,
         0, /* the request's user action time will be used automatically */
-- 
1.5.6.5