[telepathy-mission-control/master] McdDispatchOperation: prune now-unnecessary API

[Simon McVittie]

---
 src/mcd-dispatch-operation-priv.h |   22 --------------
 src/mcd-dispatch-operation.c      |   56 +++++++++++-------------------------
 2 files changed, 17 insertions(+), 61 deletions(-)

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 1179829..6fff1ce 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -90,8 +90,6 @@ G_GNUC_INTERNAL GPtrArray *_mcd_dispatch_operation_dup_channel_details (
     McdDispatchOperation *self);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_finished (
     McdDispatchOperation *self);
-G_GNUC_INTERNAL const gchar *_mcd_dispatch_operation_get_claimer (
-    McdDispatchOperation *operation);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_finish (
     McdDispatchOperation *operation);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_needs_approval (
@@ -102,34 +100,17 @@ const gchar * const *_mcd_dispatch_operation_get_possible_handlers (
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_handlers_can_bypass_approval
    (McdDispatchOperation *self);
 
-G_GNUC_INTERNAL void _mcd_dispatch_operation_set_handler_failed (
-    McdDispatchOperation *self, const gchar *bus_name);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_get_handler_failed (
     McdDispatchOperation *self, const gchar *bus_name);
-
-G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_approved (
-    McdDispatchOperation *self);
 G_GNUC_INTERNAL void _mcd_dispatch_operation_set_approved (
     McdDispatchOperation *self);
 
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_has_observers_pending (
     McdDispatchOperation *self);
-G_GNUC_INTERNAL void _mcd_dispatch_operation_inc_observers_pending (
-    McdDispatchOperation *self);
-G_GNUC_INTERNAL void _mcd_dispatch_operation_dec_observers_pending (
-    McdDispatchOperation *self);
 
 /* AddDispatchOperation calls */
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_has_ado_pending (
     McdDispatchOperation *self);
-G_GNUC_INTERNAL void _mcd_dispatch_operation_inc_ado_pending (
-    McdDispatchOperation *self);
-G_GNUC_INTERNAL void _mcd_dispatch_operation_dec_ado_pending (
-    McdDispatchOperation *self);
-
-/* Temporary client lock until observers/approvers have been started */
-G_GNUC_INTERNAL void _mcd_dispatch_operation_set_invoked_early_clients (
-    McdDispatchOperation *self);
 
 /* Client lock while waiting for approvers' opinion */
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_awaiting_approval (
@@ -140,9 +121,6 @@ G_GNUC_INTERNAL void _mcd_dispatch_operation_set_awaiting_approval (
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_get_cancelled (
     McdDispatchOperation *self);
 
-G_GNUC_INTERNAL void _mcd_dispatch_operation_check_client_locks (
-    McdDispatchOperation *self);
-
 G_GNUC_INTERNAL void _mcd_dispatch_operation_handle_channels_cb (
     McdDispatchOperation *self, TpClient *client, const GError *error);
 
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 6687a49..8f353e3 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -161,6 +161,9 @@ struct _McdDispatchOperationPrivate
 static void _mcd_dispatch_operation_check_finished (
     McdDispatchOperation *self);
 
+static void _mcd_dispatch_operation_check_client_locks (
+    McdDispatchOperation *self);
+
 static inline gboolean
 mcd_dispatch_operation_may_finish (McdDispatchOperation *self)
 {
@@ -175,10 +178,9 @@ _mcd_dispatch_operation_has_observers_pending (McdDispatchOperation *self)
     return (self->priv->observers_pending > 0);
 }
 
-void
+static void
 _mcd_dispatch_operation_inc_observers_pending (McdDispatchOperation *self)
 {
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
     g_return_if_fail (!self->priv->wants_to_finish);
 
     g_object_ref (self);
@@ -189,10 +191,9 @@ _mcd_dispatch_operation_inc_observers_pending (McdDispatchOperation *self)
     self->priv->observers_pending++;
 }
 
-void
+static void
 _mcd_dispatch_operation_dec_observers_pending (McdDispatchOperation *self)
 {
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
     DEBUG ("%" G_GSIZE_FORMAT " -> %" G_GSIZE_FORMAT,
            self->priv->observers_pending,
            self->priv->observers_pending - 1);
@@ -211,10 +212,9 @@ _mcd_dispatch_operation_has_ado_pending (McdDispatchOperation *self)
     return (self->priv->ado_pending > 0);
 }
 
-void
+static void
 _mcd_dispatch_operation_inc_ado_pending (McdDispatchOperation *self)
 {
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
     g_return_if_fail (!self->priv->wants_to_finish);
 
     g_object_ref (self);
@@ -225,10 +225,9 @@ _mcd_dispatch_operation_inc_ado_pending (McdDispatchOperation *self)
     self->priv->ado_pending++;
 }
 
-void
+static void
 _mcd_dispatch_operation_dec_ado_pending (McdDispatchOperation *self)
 {
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
     DEBUG ("%" G_GSIZE_FORMAT " -> %" G_GSIZE_FORMAT,
            self->priv->ado_pending,
            self->priv->ado_pending - 1);
@@ -250,16 +249,6 @@ _mcd_dispatch_operation_dec_ado_pending (McdDispatchOperation *self)
     g_object_unref (self);
 }
 
-void
-_mcd_dispatch_operation_set_invoked_early_clients (McdDispatchOperation *self)
-{
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
-    g_return_if_fail (self->priv->invoked_early_clients == FALSE);
-    self->priv->invoked_early_clients = TRUE;
-
-    _mcd_dispatch_operation_check_client_locks (self);
-}
-
 gboolean
 _mcd_dispatch_operation_is_awaiting_approval (McdDispatchOperation *self)
 {
@@ -282,7 +271,13 @@ _mcd_dispatch_operation_get_cancelled (McdDispatchOperation *self)
     return self->priv->cancelled;
 }
 
-void
+static inline gboolean
+_mcd_dispatch_operation_is_approved (McdDispatchOperation *self)
+{
+    return (self->priv->approved || !self->priv->needs_approval);
+}
+
+static void
 _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self)
 {
     if (self->priv->invoked_early_clients &&
@@ -1085,13 +1080,6 @@ _mcd_dispatch_operation_needs_approval (McdDispatchOperation *self)
     return self->priv->needs_approval;
 }
 
-const gchar *
-_mcd_dispatch_operation_get_claimer (McdDispatchOperation *operation)
-{
-    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (operation), NULL);
-    return operation->priv->claimer;
-}
-
 /*
  * _mcd_dispatch_operation_is_finished:
  * @self: the #McdDispatchOperation.
@@ -1282,13 +1270,10 @@ _mcd_dispatch_operation_check_finished (McdDispatchOperation *self)
     }
 }
 
-void
+static void
 _mcd_dispatch_operation_set_handler_failed (McdDispatchOperation *self,
                                             const gchar *bus_name)
 {
-    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
-    g_return_if_fail (bus_name != NULL);
-
     if (self->priv->failed_handlers == NULL)
     {
         self->priv->failed_handlers = g_hash_table_new_full (g_str_hash,
@@ -1353,14 +1338,6 @@ _mcd_dispatch_operation_handlers_can_bypass_approval (
     return FALSE;
 }
 
-gboolean
-_mcd_dispatch_operation_is_approved (McdDispatchOperation *self)
-{
-    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), FALSE);
-
-    return (self->priv->approved || !self->priv->needs_approval);
-}
-
 void
 _mcd_dispatch_operation_set_approved (McdDispatchOperation *self)
 {
@@ -1707,5 +1684,6 @@ _mcd_dispatch_operation_run_clients (McdDispatchOperation *self)
             _mcd_dispatch_operation_run_approvers (self);
     }
 
-    _mcd_dispatch_operation_set_invoked_early_clients (self);
+    self->priv->invoked_early_clients = TRUE;
+    _mcd_dispatch_operation_check_client_locks (self);
 }
-- 
1.5.6.5