Attachment 86719 Details for Bug 69814 – Prepare TpAccount if needed

[patch] Prepare TpAccount if needed

0006-Prepare-TpAccount-if-needed.patch (text/plain), 4.30 KB, created by Guillaume Desmottes on 2013-09-27 10:36:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-27 10:36:26 UTC

Size: 4.30 KB

patch

obsolete

>From 81e737aa6f2777569c603e6035d628d7e30a6d9e Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Fri, 27 Sep 2013 12:25:34 +0200
>Subject: [PATCH 6/6] Prepare TpAccount if needed
>
>Make sure that the TpAccount we receive from public API is prepared as more
>and more API are relying on it.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69814
>---
> telepathy-logger/log-manager.c | 57 +++++++++++++++++++++++++++++++++++++++++-
> tests/dbus/test-log-manager.c  | 44 ++++++++++++++++++++++++++++++++
> 2 files changed, 100 insertions(+), 1 deletion(-)
>
>diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
>index 944b741..6408621 100644
>--- a/telepathy-logger/log-manager.c
>+++ b/telepathy-logger/log-manager.c
>@@ -870,13 +870,68 @@ _get_dates_async_thread (GSimpleAsyncResult *simple,
>       _list_of_date_free);
> }
> 
>+typedef struct
>+{
>+  GSimpleAsyncResult *result;
>+  GSimpleAsyncThreadFunc func;
>+} AsyncOpData;
>+
>+static AsyncOpData *
>+async_op_data_new (GSimpleAsyncResult *result,
>+    GSimpleAsyncThreadFunc func)
>+{
>+  AsyncOpData *data = g_slice_new (AsyncOpData);
>+
>+  data->result = g_object_ref (result);
>+  data->func = func;
>+  return data;
>+}
>+
>+static void
>+async_op_data_free (AsyncOpData *data)
>+{
>+  g_object_unref (data->result);
>+  g_slice_free (AsyncOpData, data);
>+}
>+
>+static void
>+account_prepared_cb (GObject *source,
>+    GAsyncResult *result,
>+    gpointer user_data)
>+{
>+  AsyncOpData *data = user_data;
>+  GError *error = NULL;
>+
>+  if (!tp_proxy_prepare_finish (source, result, &error))
>+    {
>+      g_simple_async_result_take_error (data->result, error);
>+      g_simple_async_result_complete (data->result);
>+    }
>+  else
>+    {
>+      g_simple_async_result_run_in_thread (data->result, data->func, 0, NULL);
>+    }
>+
>+  async_op_data_free (data);
>+}
> 
> static void
> start_async_op_in_thread (TpAccount *account,
>     GSimpleAsyncResult *result,
>     GSimpleAsyncThreadFunc func)
> {
>-  g_simple_async_result_run_in_thread (result, func, 0, NULL);
>+  if (account != NULL)
>+    {
>+      GQuark features[] = { TP_ACCOUNT_FEATURE_CORE, 0 };
>+
>+      /* Most API rely on TpAccount being prepared so make sure it is */
>+      tp_proxy_prepare_async (account, features, account_prepared_cb,
>+          async_op_data_new (result, func));
>+    }
>+  else
>+    {
>+      g_simple_async_result_run_in_thread (result, func, 0, NULL);
>+    }
> }
> 
> /**
>diff --git a/tests/dbus/test-log-manager.c b/tests/dbus/test-log-manager.c
>index a6e9f5f..8b70872 100644
>--- a/tests/dbus/test-log-manager.c
>+++ b/tests/dbus/test-log-manager.c
>@@ -387,6 +387,46 @@ test_get_events_for_date (TestCaseFixture *fixture,
>   g_list_free (fixture->ret);
> }
> 
>+static void
>+test_get_events_for_date_account_unprepared (TestCaseFixture *fixture,
>+    gconstpointer user_data)
>+{
>+  GHashTable *params = (GHashTable *) user_data;
>+  TplEntity *entity;
>+  GDate *date;
>+  TpAccount *account;
>+  const gchar *account_path;
>+
>+  g_clear_object (&fixture->account);
>+
>+  account_path = g_value_get_string (
>+      (const GValue *) g_hash_table_lookup (params, "account-path"));
>+
>+  account = tp_simple_client_factory_ensure_account (fixture->factory,
>+      account_path, NULL, NULL);
>+
>+  entity = tpl_entity_new (ID, TPL_ENTITY_CONTACT, NULL, NULL);
>+  date = g_date_new_dmy (13, 1, 2010);
>+
>+  tpl_log_manager_get_events_for_date_async (fixture->manager,
>+      account,
>+      entity,
>+      TPL_EVENT_MASK_TEXT,
>+      date,
>+      get_events_for_date_cb,
>+      fixture);
>+  g_main_loop_run (fixture->main_loop);
>+
>+  g_object_unref (entity);
>+  g_date_free (date);
>+
>+  /* We got 6 events in old Empathy and 6 in new TpLogger storage */
>+  g_assert_cmpint (g_list_length (fixture->ret), ==, 12);
>+
>+  g_list_foreach (fixture->ret, (GFunc) g_object_unref, NULL);
>+  g_list_free (fixture->ret);
>+  g_object_unref (account);
>+}
> 
> static void
> get_filtered_events_cb (GObject *object,
>@@ -738,6 +778,10 @@ main (int argc, char **argv)
>       TestCaseFixture, params,
>       setup, test_get_events_for_date, teardown);
> 
>+  g_test_add ("/log-manager/get-events-for-date-account-unprepared",
>+      TestCaseFixture, params,
>+      setup, test_get_events_for_date_account_unprepared, teardown);
>+
>   g_test_add ("/log-manager/get-filtered-events",
>       TestCaseFixture, params,
>       setup, test_get_filtered_events, teardown);
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69814: 86714 | 86715 | 86716 | 86717 | 86718 | 86719

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.