[telepathy-mission-control/master] _mcd_dispatch_operation_has_observers_pending: inline

[Simon McVittie]

---
 src/mcd-dispatch-operation-priv.h |    3 ---
 src/mcd-dispatch-operation.c      |    9 +--------
 2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 0e2d3be..965dd3f 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -105,9 +105,6 @@ G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_get_handler_failed (
 G_GNUC_INTERNAL void _mcd_dispatch_operation_set_approved (
     McdDispatchOperation *self);
 
-G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_has_observers_pending (
-    McdDispatchOperation *self);
-
 /* AddDispatchOperation calls */
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_has_ado_pending (
     McdDispatchOperation *self);
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index e8ad4f2..b51dca1 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -173,13 +173,6 @@ mcd_dispatch_operation_may_finish (McdDispatchOperation *self)
             self->priv->ado_pending == 0);
 }
 
-gboolean
-_mcd_dispatch_operation_has_observers_pending (McdDispatchOperation *self)
-{
-    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), FALSE);
-    return (self->priv->observers_pending > 0);
-}
-
 static void
 _mcd_dispatch_operation_inc_observers_pending (McdDispatchOperation *self)
 {
@@ -286,7 +279,7 @@ _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self)
 {
     if (self->priv->invoked_early_clients &&
         !_mcd_dispatch_operation_has_ado_pending (self) &&
-        !_mcd_dispatch_operation_has_observers_pending (self) &&
+        self->priv->observers_pending == 0 &&
         _mcd_dispatch_operation_is_approved (self))
     {
         /* no observers etc. left */
-- 
1.5.6.5