diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-01-18 17:40:42 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-01-18 17:40:42 +0000 |
| commit | 0363701c341796278041fb9ea7de80eaaf41479a (patch) | |
| tree | 005dc8da9378917aad6cf57636b2c2558ec108bb /dbus/dbus-transport.c | |
| parent | 6ac750b03fb32591769d0a6ece8840932622fead (diff) | |
2003-01-18 Havoc Pennington <hp@pobox.com>
* dbus/dbus-connection.c (dbus_connection_unref): disconnect the
connection if it hasn't been already.
* dbus/dbus-connection.h: kill off the idea of an ErrorFunction,
replace with DisconnectFunction.
Diffstat (limited to 'dbus/dbus-transport.c')
| -rw-r--r-- | dbus/dbus-transport.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index 110153dd..28326ba7 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -215,8 +215,7 @@ _dbus_transport_disconnect (DBusTransport *transport) transport->disconnected = TRUE; - _dbus_connection_transport_error (transport->connection, - DBUS_RESULT_DISCONNECTED); + _dbus_connection_notify_disconnected (transport->connection); DBUS_TRANSPORT_RELEASE_REF (transport); } @@ -308,11 +307,7 @@ _dbus_transport_handle_watch (DBusTransport *transport, _dbus_assert (transport->vtable->handle_watch != NULL); if (transport->disconnected) - { - _dbus_connection_transport_error (transport->connection, - DBUS_RESULT_DISCONNECTED); - return; - } + return; if (dbus_watch_get_fd (watch) < 0) { @@ -367,11 +362,7 @@ _dbus_transport_messages_pending (DBusTransport *transport, _dbus_assert (transport->vtable->messages_pending != NULL); if (transport->disconnected) - { - _dbus_connection_transport_error (transport->connection, - DBUS_RESULT_DISCONNECTED); - return; - } + return; transport->messages_need_sending = queue_length > 0; @@ -404,11 +395,7 @@ _dbus_transport_do_iteration (DBusTransport *transport, return; /* Nothing to do */ if (transport->disconnected) - { - _dbus_connection_transport_error (transport->connection, - DBUS_RESULT_DISCONNECTED); - return; - } + return; DBUS_TRANSPORT_HOLD_REF (transport); (* transport->vtable->do_iteration) (transport, flags, |