From f03c0af1c7cf075111748b60e5dc22bcafe15ac8 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Thu, 2 Jun 2005 18:22:04 +0000 Subject: [PATCH] * tools/dbus-send.c (main): s/dbus_connection_disconnect/dbus_connection_close * test/glib/test-profile.c (no_bus_thread_func, with_bus_thread_func): s/dbus_connection_disconnect/dbus_connection_close * test/test-service.c (path_message_func, filter_func): s/dbus_connection_disconnect/dbus_connection_close --- ChangeLog | 10 ++++++++++ test/glib/test-profile.c | 4 ++-- test/test-service.c | 4 ++-- tools/dbus-send.c | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65e0dc5..cedd2af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,16 @@ * bus/bus.c (new_connection_callback): s/dbus_connection_disconnect/dbus_connection_close + + * tools/dbus-send.c (main): + s/dbus_connection_disconnect/dbus_connection_close + + * test/glib/test-profile.c (no_bus_thread_func, with_bus_thread_func): + s/dbus_connection_disconnect/dbus_connection_close + + * test/test-service.c (path_message_func, filter_func): + s/dbus_connection_disconnect/dbus_connection_close + 2005-05-25 Colin Walters diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c index f23c7e2..ea42bd0 100644 --- a/test/glib/test-profile.c +++ b/test/glib/test-profile.c @@ -219,7 +219,7 @@ no_bus_thread_func (void *data) g_printerr ("Client thread %p exiting main loop\n", g_thread_self()); - dbus_connection_disconnect (connection); + dbus_connection_close (connection); g_main_loop_unref (cd.loop); g_main_context_unref (context); @@ -396,7 +396,7 @@ with_bus_thread_func (void *data) g_printerr ("Client thread %p exiting main loop\n", g_thread_self()); - dbus_connection_disconnect (connection); + dbus_connection_close (connection); g_main_loop_unref (cd.loop); g_main_context_unref (context); diff --git a/test/test-service.c b/test/test-service.c index 040a030..703595e 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -92,7 +92,7 @@ path_message_func (DBusConnection *connection, "org.freedesktop.TestSuite", "Exit")) { - dbus_connection_disconnect (connection); + dbus_connection_close (connection); quit (); return DBUS_HANDLER_RESULT_HANDLED; } @@ -146,7 +146,7 @@ filter_func (DBusConnection *connection, DBUS_INTERFACE_LOCAL, "Disconnected")) { - dbus_connection_disconnect (connection); + dbus_connection_close (connection); quit (); return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 6a77c75..5747fa9 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -368,7 +368,7 @@ main (int argc, char *argv[]) dbus_message_unref (message); - dbus_connection_disconnect (connection); + dbus_connection_close (connection); exit (0); } -- 2.7.4