summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-24 17:52:20 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-24 17:52:20 +0100
commit476cfae8f5ca948d08921d402793c5ddcd512b46 (patch)
tree245b12617e73f623aa613274cfc51274c0df4652
parenta23eb00df0bc12172f0089d75346aba25a9e9026 (diff)
base-client test: close text channels cleanly rather than just taking them off the bus
-rw-r--r--tests/dbus/base-client.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index ee6e7dab..76dce2e0 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -521,7 +521,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);
@@ -663,7 +663,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;
@@ -689,8 +689,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;