Attachment 95948 Details for Bug 68892 – connection-manager: factor out all_cms_prepared()

[patch] connection-manager: factor out all_cms_prepared()

0001-connection-manager-factor-out-all_cms_prepared.patch (text/plain), 2.46 KB, created by Guillaume Desmottes on 2014-03-17 15:49:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-03-17 15:49:15 UTC

Size: 2.46 KB

patch

obsolete

>From e8b9fc31f0f4fee539dd6248bde70c2c505a6df4 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 17 Mar 2014 16:46:44 +0100
>Subject: [PATCH 1/2] connection-manager: factor out all_cms_prepared()
>
>---
> telepathy-glib/connection-manager.c | 46 +++++++++++++++++++++----------------
> 1 file changed, 26 insertions(+), 20 deletions(-)
>
>diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
>index 8d77617..34b3889 100644
>--- a/telepathy-glib/connection-manager.c
>+++ b/telepathy-glib/connection-manager.c
>@@ -1789,6 +1789,31 @@ list_context_unref (_ListContext *list_context)
> }
> 
> static void
>+all_cms_prepared (_ListContext *list_context)
>+{
>+  TpConnectionManager **cms;
>+  guint n_cms = list_context->arr->len;
>+
>+  DEBUG ("We've prepared as many as possible of %u CMs", n_cms);
>+
>+  g_assert (list_context->callback != NULL);
>+
>+  g_ptr_array_add (list_context->arr, NULL);
>+  cms = (TpConnectionManager **) list_context->arr->pdata;
>+
>+  /* If we never had a weak object anyway, call the callback.
>+   * If we had a weak object when we started, only call the callback
>+   * if it hasn't died yet. */
>+  if (!list_context->had_weak_object || list_context->weak_object != NULL)
>+    {
>+      list_context->callback (cms, n_cms, NULL, list_context->user_data,
>+          list_context->weak_object);
>+    }
>+
>+  list_context->callback = NULL;
>+}
>+
>+static void
> tp_list_connection_managers_cm_prepared (GObject *source,
>     GAsyncResult *result,
>     gpointer user_data)
>@@ -1814,26 +1839,7 @@ tp_list_connection_managers_cm_prepared (GObject *source,
> 
>   if (list_context->cms_to_ready == 0)
>     {
>-      TpConnectionManager **cms;
>-      guint n_cms = list_context->arr->len;
>-
>-      DEBUG ("We've prepared as many as possible of %u CMs", n_cms);
>-
>-      g_assert (list_context->callback != NULL);
>-
>-      g_ptr_array_add (list_context->arr, NULL);
>-      cms = (TpConnectionManager **) list_context->arr->pdata;
>-
>-      /* If we never had a weak object anyway, call the callback.
>-       * If we had a weak object when we started, only call the callback
>-       * if it hasn't died yet. */
>-      if (!list_context->had_weak_object || list_context->weak_object != NULL)
>-        {
>-          list_context->callback (cms, n_cms, NULL, list_context->user_data,
>-              list_context->weak_object);
>-        }
>-
>-      list_context->callback = NULL;
>+      all_cms_prepared (list_context);
>     }
>   else
>     {
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 68892: 95948 | 95949

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.