diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-03-08 19:41:27 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-03-09 20:34:54 +0000 |
| commit | af4557de8c55fd660f878fca0fa154832f988918 (patch) | |
| tree | 1994f5e79ded59832cd135cd5901e2dd1e403265 /tests/dbus | |
| parent | a82fa3916da83c5a121f2964198a3a177be4d7bd (diff) | |
params-cm.c: use test_connection_manager_run_until_ready
Diffstat (limited to 'tests/dbus')
| -rw-r--r-- | tests/dbus/params-cm.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/dbus/params-cm.c b/tests/dbus/params-cm.c index 6942121d1..4e1dbc405 100644 --- a/tests/dbus/params-cm.c +++ b/tests/dbus/params-cm.c @@ -51,18 +51,6 @@ typedef struct } Test; static void -cm_ready_cb (TpConnectionManager *cm G_GNUC_UNUSED, - const GError *error, - gpointer user_data, - GObject *weak_object G_GNUC_UNUSED) -{ - Test *test = user_data; - - test_assert_no_error (error); - g_main_loop_quit (test->mainloop); -} - -static void setup (Test *test, gconstpointer data G_GNUC_UNUSED) { @@ -89,9 +77,7 @@ setup (Test *test, test->cm = tp_connection_manager_new (test->dbus, "params_cm", NULL, &test->error); g_assert (test->cm != NULL); - tp_connection_manager_call_when_ready (test->cm, cm_ready_cb, test, NULL, - NULL); - g_main_loop_run (test->mainloop); + test_connection_manager_run_until_ready (test->cm); } static void |