diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2014-03-26 17:10:41 -0400 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 15:36:03 +0000 |
| commit | dce022ece0f4a33e55d49d83fdc2d75286c32675 (patch) | |
| tree | 9ec2ba63ea788bf9dabf022d424fffcb16ebce8d | |
| parent | b656ea2bc827ba8998d77f0b0c215e170b6b687d (diff) | |
| download | telepathy-glib-dce022ece0f4a33e55d49d83fdc2d75286c32675.tar.gz | |
Tests: Use GDBusConnection directly to list activatable names
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | tests/dbus/account-manager.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/tests/dbus/account-manager.c b/tests/dbus/account-manager.c index 8a374a334..42d380398 100644 --- a/tests/dbus/account-manager.c +++ b/tests/dbus/account-manager.c @@ -304,21 +304,27 @@ manager_new_action (gpointer script_data, /* We really don't want to have MC being launched during this test */ static void -finish_assert_am_not_activatable_action (TpDBusDaemon *proxy, - const gchar * const *names, - const GError *error, - gpointer user_data, - GObject *weak_object) +finish_assert_am_not_activatable_action (GObject *source, + GAsyncResult *result, + gpointer user_data) { + GDBusConnection *dbus_connection = (GDBusConnection *) source; + GVariant *reply; + const gchar **names; guint i; + GError *error = NULL; - g_assert (error == NULL); + reply = g_dbus_connection_call_finish (dbus_connection, result, &error); + g_assert_no_error (error); + g_variant_get (reply, "(^a&s)", &names); for (i=0; names[i] != NULL; i++) { g_assert_cmpstr (names[i], !=, TP_ACCOUNT_MANAGER_BUS_NAME); g_assert_cmpstr (names[i], !=, "im.telepathy.v1.MissionControl5"); } + g_free (names); + g_variant_unref (reply); script_continue (user_data); } @@ -329,8 +335,14 @@ assert_am_not_activatable_action (gpointer script_data, { Test *test = (Test *) script_data; - tp_dbus_daemon_list_activatable_names (test->dbus, 500, - finish_assert_am_not_activatable_action, test, NULL, NULL); + g_dbus_connection_call (tp_proxy_get_dbus_connection (test->dbus), + "org.freedesktop.DBus", "/", "org.freedesktop.DBus", + "ListActivatableNames", + g_variant_new ("()"), + G_VARIANT_TYPE ("(as)"), + G_DBUS_CALL_FLAGS_NONE, + 500, NULL, + finish_assert_am_not_activatable_action, test); } static void |