[telepathy-mission-control/master] _mcd_dispatch_operation_dec_observers_pending: incorporate the functionality of mcd_dispatcher_context_release_pending_observer

[Simon McVittie]

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

diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 62cf9ae..3392d28 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -197,6 +197,7 @@ _mcd_dispatch_operation_dec_observers_pending (McdDispatchOperation *self)
     self->priv->observers_pending--;
 
     _mcd_dispatch_operation_check_finished (self);
+    _mcd_dispatch_operation_check_client_locks (self);
     g_object_unref (self);
 }
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index e123ac4..ec729ea 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -865,13 +865,6 @@ finally:
 }
 
 static void
-mcd_dispatcher_context_release_pending_observer (McdDispatcherContext *context)
-{
-    _mcd_dispatch_operation_dec_observers_pending (context->operation);
-    _mcd_dispatch_operation_check_client_locks (context->operation);
-}
-
-static void
 observe_channels_cb (TpClient *proxy, const GError *error,
                      gpointer user_data, GObject *weak_object)
 {
@@ -884,7 +877,7 @@ observe_channels_cb (TpClient *proxy, const GError *error,
     else
         DEBUG ("success from %s", tp_proxy_get_object_path (proxy));
 
-    mcd_dispatcher_context_release_pending_observer (context);
+    _mcd_dispatch_operation_dec_observers_pending (context->operation);
 }
 
 /* The returned GPtrArray is allocated, but the contents are borrowed. */
-- 
1.5.6.5