[telepathy-mission-control/master] _mcd_dispatch_operation_get_handler_failed: internalize

[Simon McVittie]

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

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 965dd3f..30e9b3c 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -100,8 +100,6 @@ 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 gboolean _mcd_dispatch_operation_get_handler_failed (
-    McdDispatchOperation *self, const gchar *bus_name);
 G_GNUC_INTERNAL void _mcd_dispatch_operation_set_approved (
     McdDispatchOperation *self);
 
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index b51dca1..7361e96 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -1288,14 +1288,12 @@ _mcd_dispatch_operation_set_handler_failed (McdDispatchOperation *self,
                          self->priv->failed_handlers);
 }
 
-gboolean
+static gboolean
 _mcd_dispatch_operation_get_handler_failed (McdDispatchOperation *self,
                                             const gchar *bus_name)
 {
-    /* return TRUE on error so we can't get an infinite loop of trying the
-     * same handler */
-    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), TRUE);
-    g_return_val_if_fail (bus_name != NULL, TRUE);
+    g_assert (MCD_IS_DISPATCH_OPERATION (self));
+    g_assert (bus_name != NULL);
 
     if (self->priv->failed_handlers == NULL)
         return FALSE;
-- 
1.5.6.5