telepathy-mission-control: mcd_dispatcher_context_proceed: make private

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 5a3a0b3d417423a5fb588b36c65f0c7709556de9
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=5a3a0b3d417423a5fb588b36c65f0c7709556de9

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May  8 13:54:03 2012 +0100

mcd_dispatcher_context_proceed: make private

Ideally it should be inlined into its only caller, but this will do for
now.

---

 src/mcd-dispatcher-context.h |    9 ---------
 src/mcd-dispatcher.c         |   18 +++---------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/mcd-dispatcher-context.h b/src/mcd-dispatcher-context.h
index 4957930..fa1f0a2 100644
--- a/src/mcd-dispatcher-context.h
+++ b/src/mcd-dispatcher-context.h
@@ -97,15 +97,6 @@ void mcd_dispatcher_context_destroy_all (McdDispatcherContext *context);
 
 void mcd_dispatcher_context_forget_all (McdDispatcherContext *context);
 
-/* Statemachine API section */
-
-/* Will step through the state machine.
- * @param ctx: The context
- * @param result: The return code
- */
-
-void mcd_dispatcher_context_proceed (McdDispatcherContext *context);
-
 G_END_DECLS
 
 #endif
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index da99e5b..226b748 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -327,6 +327,8 @@ on_operation_finished (McdDispatchOperation *operation,
     }
 }
 
+static void mcd_dispatcher_context_proceed (McdDispatcherContext *context);
+
 static void
 _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
                                      GList *channels,
@@ -1011,15 +1013,7 @@ mcd_dispatcher_new (TpDBusDaemon *dbus_daemon, McdMaster *master)
     return obj;
 }
 
-/**
- * mcd_dispatcher_context_proceed:
- * @context: a #McdDispatcherContext
- *
- * Must be called by plugin filters exactly once per invocation of the filter
- * function, to proceed with processing of the @context. This does nothing
- * if @context has already finished.
- */
-void
+static void
 mcd_dispatcher_context_proceed (McdDispatcherContext *context)
 {
     GError error = { TP_ERROR, 0, NULL };
@@ -1079,9 +1073,6 @@ mcd_dispatcher_context_forget_all (McdDispatcherContext *context)
  *
  * Consider all channels in the #McdDispatcherContext to be undispatchable,
  * and close them destructively. Information loss might result.
- *
- * Plugins must still call mcd_dispatcher_context_proceed() afterwards,
- * to release their reference to the dispatcher context.
  */
 void
 mcd_dispatcher_context_destroy_all (McdDispatcherContext *context)
@@ -1102,9 +1093,6 @@ mcd_dispatcher_context_destroy_all (McdDispatcherContext *context)
  * attempt to use the RemoveMembersWithReason D-Bus method to specify
  * a message and reason, falling back to the Close method if that doesn't
  * work.
- *
- * Plugins must still call mcd_dispatcher_context_proceed() afterwards,
- * to release their reference to the dispatcher context.
  */
 void
 mcd_dispatcher_context_close_all (McdDispatcherContext *context,