summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-05-25 11:07:01 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-05-25 11:07:01 +0200
commit7f232db322e5128944d9d8a21df3c5ec6ec8a971 (patch)
tree2eb8b9d9da5e73a88157b217d88d5c2523a61f0d
parentf70f82aabc8da639a47822fc6dd945e8a4256655 (diff)
test-cdo: properly close text channels
-rw-r--r--tests/dbus/channel-dispatch-operation.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/dbus/channel-dispatch-operation.c b/tests/dbus/channel-dispatch-operation.c
index 903c5dec..2743dc2b 100644
--- a/tests/dbus/channel-dispatch-operation.c
+++ b/tests/dbus/channel-dispatch-operation.c
@@ -560,7 +560,7 @@ test_channel_lost (Test *test,
test);
/* First channel disappears and so is lost */
- 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;
@@ -583,7 +583,7 @@ test_channel_lost (Test *test,
g_signal_connect (test->cdo, "invalidated", G_CALLBACK (invalidated_cb),
test);
- 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;
@@ -672,7 +672,7 @@ test_channel_lost_preparing (Test *test,
tp_proxy_prepare_async (test->cdo, features, features_prepared_cb, test);
/* First channel disappears while preparing */
- 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;
@@ -723,7 +723,7 @@ test_finished_preparing (Test *test,
tp_proxy_prepare_async (test->cdo, features, features_not_prepared_cb, test);
/* The 2 channels are lost while preparing */
- 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;
@@ -731,7 +731,7 @@ test_finished_preparing (Test *test,
simple_channel_dispatch_operation_lost_channel (test->cdo_service,
test->text_chan);
- 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;