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/dispatch.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/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |