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

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Oct 20 12:18:57 PDT 2009


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

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 170a3f0..5eb29ca 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -536,7 +536,6 @@ on_operation_finished (McdDispatchOperation *operation,
     }
 }
 
-/* ownership of @channels is stolen */
 static void
 _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
                                      GList *channels,
@@ -584,8 +583,6 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
         priv->handler_map, !requested, channels,
         (const gchar * const *) possible_handlers);
 
-    g_list_free (channels);
-
     if (!requested)
     {
         if (priv->operation_list_active)
@@ -1677,6 +1674,7 @@ _mcd_dispatcher_take_channels (McdDispatcher *dispatcher, GList *channels,
 
         _mcd_dispatcher_enter_state_machine (dispatcher, channels,
             (const gchar * const *) possible_handlers, requested);
+        g_list_free (channels);
     }
 
     g_strfreev (possible_handlers);
-- 
1.5.6.5




More information about the telepathy-commits mailing list