diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | bus/bus.c | 2 | ||||
| -rw-r--r-- | bus/connection.c | 8 | ||||
| -rw-r--r-- | bus/dispatch.c | 8 | ||||
| -rw-r--r-- | dbus/dbus-bus.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 8 | ||||
| -rw-r--r-- | dbus/dbus-connection.h | 2 |
7 files changed, 37 insertions, 15 deletions
@@ -1,3 +1,25 @@ +2005-06-02 John (J5) Palmieri <johnp@redhat.com> + + * 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 + 2005-05-25 Colin Walters <walters@verbum.org> * dbus/dbus-protocol.h: Move various bus service #defines such @@ -177,7 +177,7 @@ new_connection_callback (DBusServer *server, * 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, diff --git a/bus/connection.c b/bus/connection.c index d11621ae..2e3675f9 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -501,7 +501,7 @@ bus_connections_unref (BusConnections *connections) 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 @@ bus_connections_unref (BusConnections *connections) 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 @@ bus_connections_setup_connection (BusConnections *connections, * 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 @@ bus_connections_expire_incomplete (BusConnections *connections) if (elapsed >= (double) auth_timeout) { _dbus_verbose ("Timing out authentication for connection %p\n", connection); - dbus_connection_disconnect (connection); + dbus_connection_close (connection); } else { diff --git a/bus/dispatch.c b/bus/dispatch.c index 0803843e..123a29ed 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -242,7 +242,7 @@ bus_dispatch (DBusConnection *connection, 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 @@ kill_client_connection (BusContext *context, 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 @@ kill_client_connection_unchecked (DBusConnection *connection) _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 @@ check_hello_connection (BusContext *context) if (!bus_setup_debug_client (connection)) { - dbus_connection_disconnect (connection); + dbus_connection_close (connection); dbus_connection_unref (connection); return TRUE; } 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, |