diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-25 10:34:58 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-25 10:34:58 +0200 |
| commit | f70f82aabc8da639a47822fc6dd945e8a4256655 (patch) | |
| tree | 82c599d4d2ff4b41b19c291578d5ad96aba41d40 | |
| parent | 36b34daedf3dabafe5fa6f630295272dbecd70f7 (diff) | |
| parent | 476cfae8f5ca948d08921d402793c5ddcd512b46 (diff) | |
Merge remote branch 'smcv/handler' into base-handler-27872
| -rw-r--r-- | tests/dbus/base-client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c index 84739c39c..1c76c6c62 100644 --- a/tests/dbus/base-client.c +++ b/tests/dbus/base-client.c @@ -523,7 +523,7 @@ test_observer (Test *test, channels, "/", requests_satisified, info, no_return_cb, test, NULL, NULL); - tp_dbus_daemon_unregister_object (test->dbus, test->text_chan_service); + test_text_channel_null_close (test->text_chan_service); g_main_loop_run (test->mainloop); g_assert_no_error (test->error); @@ -665,7 +665,7 @@ test_approver (Test *test, channels, CDO_PATH, properties, no_return_cb, test, NULL, NULL); - tp_dbus_daemon_unregister_object (test->dbus, test->text_chan_service_2); + test_text_channel_null_close (test->text_chan_service_2); g_object_unref (test->text_chan_service_2); test->text_chan_service_2 = NULL; @@ -691,8 +691,7 @@ test_approver (Test *test, channels, CDO_PATH, properties, no_return_cb, test, NULL, NULL); - tp_dbus_daemon_unregister_object (test->dbus, test->text_chan_service); - + test_text_channel_null_close (test->text_chan_service); g_object_unref (test->text_chan_service); test->text_chan_service = NULL; |