dbus/bus bus.c, 1.61, 1.62 connection.c, 1.59, 1.60 dispatch.c, 1.68, 1.69

[John Palmieri]

Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv6003/bus

Modified Files:
	bus.c connection.c dispatch.c 
Log Message:
	*  dbus/dbus-connection.c, dbus/dbus-connection.h 
	(dbus_connection_disconnect): renamed to dbus_connection_close 
	for API symmetry with dbus_connection_open
	(_dbus_connection_open_internal): 
	s/dbus_connection_disconnect/dbus_connection_close

	* dbus/dbus-bus.c (dbus_bus_get):
	s/dbus_connection_disconnect/dbus_connection_close

	* bus/connection.c (bus_connections_unref, 
	bus_connections_setup_connection, bus_connections_expire_incomplete):
	s/dbus_connection_disconnect/dbus_connection_close

	* bus/dispatch.c (bus_dispatch, kill_client_connection, 
	kill_client_connection_unchecked, check_hello_connection):
	s/dbus_connection_disconnect/dbus_connection_close

	* bus/bus.c (new_connection_callback):
	s/dbus_connection_disconnect/dbus_connection_close


Index: bus.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- bus.c	13 Apr 2005 14:27:11 -0000	1.61
+++ bus.c	2 Jun 2005 17:41:04 -0000	1.62
@@ -177,7 +177,7 @@
        * that we have to do this, people won't get it right
        * in general.
        */
-      dbus_connection_disconnect (new_connection);
+      dbus_connection_close (new_connection);
     }
 
   dbus_connection_set_max_received_size (new_connection,

Index: connection.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/connection.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- connection.c	17 Feb 2005 21:19:49 -0000	1.59
+++ connection.c	2 Jun 2005 17:41:04 -0000	1.60
@@ -501,7 +501,7 @@
           connection = connections->incomplete->data;
 
           dbus_connection_ref (connection);
-          dbus_connection_disconnect (connection);
+          dbus_connection_close (connection);
           bus_connection_disconnected (connection);
           dbus_connection_unref (connection);
         }
@@ -516,7 +516,7 @@
           connection = connections->completed->data;
 
           dbus_connection_ref (connection);
-          dbus_connection_disconnect (connection);
+          dbus_connection_close (connection);
           bus_connection_disconnected (connection);
           dbus_connection_unref (connection);
         }
@@ -653,7 +653,7 @@
        * completing authentication. But random may or may not really
        * help with that, a more elaborate solution might be required.
        */
-      dbus_connection_disconnect (connections->incomplete->data);
+      dbus_connection_close (connections->incomplete->data);
     }
   
   retval = TRUE;
@@ -739,7 +739,7 @@
           if (elapsed >= (double) auth_timeout)
             {
               _dbus_verbose ("Timing out authentication for connection %p\n", connection);
-              dbus_connection_disconnect (connection);
+              dbus_connection_close (connection);
             }
           else
             {

Index: dispatch.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/dispatch.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- dispatch.c	17 Feb 2005 21:19:49 -0000	1.68
+++ dispatch.c	2 Jun 2005 17:41:04 -0000	1.69
@@ -242,7 +242,7 @@
   else if (!bus_connection_is_active (connection)) /* clients must talk to bus driver first */
     {
       _dbus_verbose ("Received message from non-registered client. Disconnecting.\n");
-      dbus_connection_disconnect (connection);
+      dbus_connection_close (connection);
       goto out;
     }
   else if (service_name != NULL) /* route to named service */
@@ -634,7 +634,7 @@
   dbus_connection_ref (connection);
   
   /* kick in the disconnect handler that unrefs the connection */
-  dbus_connection_disconnect (connection);
+  dbus_connection_close (connection);
 
   bus_test_run_everything (context);
   
@@ -675,7 +675,7 @@
   _dbus_verbose ("Unchecked kill of connection %p\n", connection);
 
   dbus_connection_ref (connection);
-  dbus_connection_disconnect (connection);
+  dbus_connection_close (connection);
   /* dispatching disconnect handler will unref once */
   if (bus_connection_dispatch_one_message (connection))
     _dbus_assert_not_reached ("message other than disconnect dispatched after failure to register");
@@ -1490,7 +1490,7 @@
 
   if (!bus_setup_debug_client (connection))
     {
-      dbus_connection_disconnect (connection);
+      dbus_connection_close (connection);
       dbus_connection_unref (connection);
       return TRUE;
     }