diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-06-02 17:41:04 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-06-02 17:41:04 +0000 |
| commit | 11fd3b965f9c8dc062913d82d6a2cf73b6ba0bda (patch) | |
| tree | 5631c04cf2c5f0eb784402e41561d365bcc8cf87 /bus/connection.c | |
| parent | 0b7923b4cfdfde00ecfb7b42c9ea0bc991c1cba6 (diff) | |
* 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
Diffstat (limited to 'bus/connection.c')
| -rw-r--r-- | bus/connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |