* 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

3 files changed, 6 insertions, 6 deletions

diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index fedee0f0..c112d2ab 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -396,7 +396,7 @@ dbus_bus_get (DBusBusType  type,
   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);
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index edc57b84..13aed451 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -1622,7 +1622,7 @@ _dbus_connection_open_internal (const char     *address,
                   !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 @@ dbus_connection_unref (DBusConnection *connection)
  * 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 @@ dbus_connection_unref (DBusConnection *connection)
  * @param connection the connection.
  */
 void
-dbus_connection_disconnect (DBusConnection *connection)
+dbus_connection_close (DBusConnection *connection)
 {
   DBusDispatchStatus status;
   
@@ -1959,7 +1959,7 @@ _dbus_connection_get_is_connected_unlocked (DBusConnection *connection)
  * 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.
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index 25a5b0ea..8949f432 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -93,7 +93,7 @@ DBusConnection*    dbus_connection_open_private                 (const char
                                                                  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,