* 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

diff --git a/ChangeLog b/ChangeLog
index 65e0dc59869ecdc923f8c94e89daa4cec4bb2b94..cedd2afd0e318b7863d616f9dcbc816eda375333 100644 (file)
--- 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  <walters@verbum.org>
 

diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c
index f23c7e26e9c763683e398f7780a9451ce0d79c77..ea42bd0821a7beb491551be6e81c45f5e2cc1f6e 100644 (file)
--- 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 040a0300d9cd84bd41266b8d1152e1f9527cc1b0..703595e4dd65aba9123d251293de397fba4c0bde 100644 (file)
--- 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 6a77c75c68c30f2e016af9dfb4fa6d152e30c44c..5747fa974098e0310a06e51abc2859a2f11b3463 100644 (file)
--- 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);
 }