[telepathy-mission-control/master] _mcd_dispatcher_enter_state_machine: don't steal @possible_handlers

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Sep 21 03:51:54 PDT 2009


---
 src/mcd-dispatcher.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 3fe7913..83f7151 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1585,11 +1585,11 @@ on_operation_finished (McdDispatchOperation *operation,
     mcd_dispatcher_context_unref (context, "CTXREF15");
 }
 
-/* ownership of channels, possible_handlers is stolen */
+/* ownership of @channels is stolen */
 static void
 _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
                                      GList *channels,
-                                     GStrv possible_handlers,
+                                     const gchar * const *possible_handlers,
                                      gboolean requested)
 {
     McdDispatcherContext *context;
@@ -1636,8 +1636,6 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
     context->operation = _mcd_dispatch_operation_new (priv->dbus_daemon,
         !requested, channels, (const gchar * const *) possible_handlers);
 
-    g_strfreev (possible_handlers);
-
     if (requested)
     {
         context->approved = TRUE;
@@ -3777,8 +3775,10 @@ _mcd_dispatcher_take_channels (McdDispatcher *dispatcher, GList *channels,
                                      MCD_CHANNEL_STATUS_DISPATCHING);
 
         _mcd_dispatcher_enter_state_machine (dispatcher, channels,
-                                             possible_handlers, requested);
+            (const gchar * const *) possible_handlers, requested);
     }
+
+    g_strfreev (possible_handlers);
 }
 
 /**
-- 
1.5.6.5




More information about the telepathy-commits mailing list