[telepathy-mission-control/master] _mcd_dispatch_operation_finish: internalize, and return void

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Nov 2 06:41:52 PST 2009


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

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 6b160a0..60f814b 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -82,8 +82,6 @@ G_GNUC_INTERNAL GList *_mcd_dispatch_operation_dup_channels (
 
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_finished (
     McdDispatchOperation *self);
-G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_finish (
-    McdDispatchOperation *operation);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_needs_approval (
     McdDispatchOperation *self);
 G_GNUC_INTERNAL
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 95058f5..14279aa 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -515,7 +515,7 @@ mcd_dispatch_operation_actually_finish (McdDispatchOperation *self)
     g_object_unref (self);
 }
 
-gboolean
+static void
 _mcd_dispatch_operation_finish (McdDispatchOperation *operation)
 {
     McdDispatchOperationPrivate *priv = operation->priv;
@@ -523,7 +523,7 @@ _mcd_dispatch_operation_finish (McdDispatchOperation *operation)
     if (priv->wants_to_finish)
     {
         DEBUG ("already finished (or about to)!");
-        return FALSE;
+        return;
     }
 
     priv->wants_to_finish = TRUE;
@@ -538,8 +538,6 @@ _mcd_dispatch_operation_finish (McdDispatchOperation *operation)
         DEBUG ("%s/%p not finishing just yet", priv->unique_name,
                operation);
     }
-
-    return TRUE;
 }
 
 static gboolean mcd_dispatch_operation_check_handle_with (
-- 
1.5.6.5




More information about the telepathy-commits mailing list