Attachment 64436 Details for Bug 52305 – mcd_dispatcher_dup_possible_handlers: only take one TpChannel

[patch] mcd_dispatcher_dup_possible_handlers: only take one TpChannel

0004-mcd_dispatcher_dup_possible_handlers-only-take-one-T.patch (text/plain), 3.12 KB, created by Simon McVittie on 2012-07-20 13:46:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-07-20 13:46:08 UTC

Size: 3.12 KB

patch

obsolete

>From df0e53d99194641bcdaa0501b1ce3828fb5b8dc1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 20 Jul 2012 11:51:38 +0100
>Subject: [PATCH 04/16] mcd_dispatcher_dup_possible_handlers: only take one
> TpChannel
>
>---
> src/mcd-dispatcher.c |   19 ++++++-------------
> 1 file changed, 6 insertions(+), 13 deletions(-)
>
>diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
>index 9c17050..1807f20 100644
>--- a/src/mcd-dispatcher.c
>+++ b/src/mcd-dispatcher.c
>@@ -178,9 +178,10 @@ mcd_dispatcher_dup_internal_handlers (void)
> static GStrv
> mcd_dispatcher_dup_possible_handlers (McdDispatcher *self,
>                                       McdRequest *request,
>-                                      const GList *channels,
>+                                      TpChannel *channel,
>                                       const gchar *must_have_unique_name)
> {
>+    GList *channels = g_list_prepend (NULL, channel);
>     GList *handlers = _mcd_client_registry_list_possible_handlers (
>         self->priv->clients,
>         request != NULL ? _mcd_request_get_preferred_handler (request) : NULL,
>@@ -191,6 +192,8 @@ mcd_dispatcher_dup_possible_handlers (McdDispatcher *self,
>     GStrv ret;
>     const GList *iter;
> 
>+    g_list_free (channels);
>+
>     if (handlers == NULL)
>         return NULL;
> 
>@@ -939,7 +942,6 @@ _mcd_dispatcher_add_channel (McdDispatcher *dispatcher,
> {
>     GList *channels = NULL;
>     TpChannel *tp_channel = NULL;
>-    GList *tp_channels = NULL;
>     GStrv possible_handlers;
>     McdRequest *request = NULL;
>     gboolean internal_request = FALSE;
>@@ -970,7 +972,6 @@ _mcd_dispatcher_add_channel (McdDispatcher *dispatcher,
>      * It might also have the McdRequest part. */
>     tp_channel = mcd_channel_get_tp_channel (channel);
>     g_assert (tp_channel != NULL);
>-    tp_channels = g_list_prepend (NULL, g_object_ref (tp_channel));
> 
>     request = _mcd_channel_get_request (channel);
>     internal_request = _mcd_request_is_internal (request);
>@@ -981,12 +982,9 @@ _mcd_dispatcher_add_channel (McdDispatcher *dispatcher,
>     else
>         possible_handlers = mcd_dispatcher_dup_possible_handlers (dispatcher,
>                                                                   request,
>-                                                                  tp_channels,
>+                                                                  tp_channel,
>                                                                   NULL);
> 
>-    g_list_foreach (tp_channels, (GFunc) g_object_unref, NULL);
>-    g_list_free (tp_channels);
>-
>     if (possible_handlers == NULL)
>     {
>         DEBUG ("Channel cannot be handled - making a CDO "
>@@ -2091,16 +2089,11 @@ add_possible_handlers (McdDispatcher *self,
>     const gchar *sender,
>     const gchar *preferred_handler)
> {
>-    GList *channels = NULL;
>     GStrv possible_handlers;
>     guint i;
> 
>-    channels = g_list_prepend (channels, tp_channel);
>-
>     possible_handlers = mcd_dispatcher_dup_possible_handlers (self,
>-        NULL, channels, NULL);
>-
>-    g_list_free (channels);
>+        NULL, tp_channel, NULL);
> 
>     for (i = 0; possible_handlers[i] != NULL; i++)
>       {
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 52305: 64431 | 64432 | 64433 | 64436 | 64437 | 64438 | 64439 | 64440 | 64441 | 64442 | 64443 | 64444 | 64445 | 64446 | 64447 | 64448

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.