[telepathy-mission-control/master] McdDispatchOperation: make inc_ado_pending imply block_finished

[Simon McVittie]

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

diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 8939697..b2a6d11 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -176,6 +176,7 @@ _mcd_dispatch_operation_inc_ado_pending (McdDispatchOperation *self)
     g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
 
     g_object_ref (self);
+    _mcd_dispatch_operation_block_finished (self);
 
     DEBUG ("%" G_GSIZE_FORMAT " -> %" G_GSIZE_FORMAT,
            self->priv->ado_pending,
@@ -193,6 +194,7 @@ _mcd_dispatch_operation_dec_ado_pending (McdDispatchOperation *self)
     g_return_if_fail (self->priv->ado_pending > 0);
     self->priv->ado_pending--;
 
+    _mcd_dispatch_operation_unblock_finished (self);
     g_object_unref (self);
 }
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 867e0a9..c782120 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1105,8 +1105,6 @@ add_dispatch_operation_cb (TpClient *proxy, const GError *error,
      * one approver accepted it, then we can still continue dispatching,
      * since it will be stalled until awaiting_approval becomes FALSE. */
     mcd_dispatcher_context_release_pending_approver (context);
-
-    _mcd_dispatch_operation_unblock_finished (context->operation);
 }
 
 static void
@@ -1172,7 +1170,6 @@ mcd_dispatcher_run_approvers (McdDispatcherContext *context)
                dispatch_operation, context->operation, context);
 
         _mcd_dispatch_operation_inc_ado_pending (context->operation);
-        _mcd_dispatch_operation_block_finished (context->operation);
 
         mcd_dispatcher_context_ref (context, "CTXREF06");
         tp_cli_client_approver_call_add_dispatch_operation (
-- 
1.5.6.5