dbus/dbus dbus-bus.c, 1.41, 1.42 dbus-connection.c, 1.105, 1.106 dbus-connection.h, 1.37, 1.38

[John Palmieri]

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

Modified Files:
	dbus-bus.c dbus-connection.c dbus-connection.h 
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: dbus-bus.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dbus-bus.c	25 Feb 2005 22:03:30 -0000	1.41
+++ dbus-bus.c	2 Jun 2005 17:41:04 -0000	1.42
@@ -396,7 +396,7 @@
   if (!dbus_bus_register (connection, error))
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
-      dbus_connection_disconnect (connection);
+      dbus_connection_close (connection);
       dbus_connection_unref (connection);
 
       _DBUS_UNLOCK (bus);

Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- dbus-connection.c	24 Apr 2005 14:04:16 -0000	1.105
+++ dbus-connection.c	2 Jun 2005 17:41:04 -0000	1.106
@@ -1622,7 +1622,7 @@
                   !connection_record_shared_unlocked (connection, guid))
                 {
                   _DBUS_SET_OOM (&tmp_error);
-                  dbus_connection_disconnect (connection);
+                  dbus_connection_close (connection);
                   dbus_connection_unref (connection);
                   connection = NULL;
                 }
@@ -1918,7 +1918,7 @@
  * Any further attempts to send data will result in errors.  This
  * function does not affect the connection's reference count.  It's
  * safe to disconnect a connection more than once; all calls after the
- * first do nothing. It's impossible to "reconnect" a connection, a
+ * first do nothing. It's impossible to "reopen" a connection, a
  * new connection must be created. This function may result in a call
  * to the DBusDispatchStatusFunction set with
  * dbus_connection_set_dispatch_status_function(), as the disconnect
@@ -1927,7 +1927,7 @@
  * @param connection the connection.
  */
 void
-dbus_connection_disconnect (DBusConnection *connection)
+dbus_connection_close (DBusConnection *connection)
 {
   DBusDispatchStatus status;
   
@@ -1959,7 +1959,7 @@
  * connections are connected when they are opened.  A connection may
  * become disconnected when the remote application closes its end, or
  * exits; a connection may also be disconnected with
- * dbus_connection_disconnect().
+ * dbus_connection_close().
  *
  * @param connection the connection.
  * @returns #TRUE if the connection is still alive.

Index: dbus-connection.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- dbus-connection.h	24 Apr 2005 14:04:16 -0000	1.37
+++ dbus-connection.h	2 Jun 2005 17:41:04 -0000	1.38
@@ -93,7 +93,7 @@
                                                                  DBusError                  *error);
 DBusConnection*    dbus_connection_ref                          (DBusConnection             *connection);
 void               dbus_connection_unref                        (DBusConnection             *connection);
-void               dbus_connection_disconnect                   (DBusConnection             *connection);
+void               dbus_connection_close                        (DBusConnection             *connection);
 dbus_bool_t        dbus_connection_get_is_connected             (DBusConnection             *connection);
 dbus_bool_t        dbus_connection_get_is_authenticated         (DBusConnection             *connection);
 void               dbus_connection_set_exit_on_disconnect       (DBusConnection             *connection,