diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/bus.c | 2 | ||||
| -rw-r--r-- | bus/connection.c | 8 | ||||
| -rw-r--r-- | bus/dispatch.c | 8 |
3 files changed, 9 insertions, 9 deletions
@@ -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; } |