diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2005-09-11 10:02:47 +0000 |
|---|---|---|
| committer | Mark McLoughlin <mark@skynet.ie> | 2005-09-11 10:02:47 +0000 |
| commit | 5e8110d79aa8c11ad76b3e77791e3e6daca0fa32 (patch) | |
| tree | 666a413cc550c06bedb3092acddf87b57df4b80e /dbus/dbus-transport-unix.c | |
| parent | 24c6ddc1a41e280c877233f98569d4e21d12f1ef (diff) | |
2005-09-11 Mark McLoughlin <mark@skynet.ie>
* test/data/auth/fallback.auth-script: we don't
retry the EXTERNAL method when we know its going
to fail anymore.
2005-09-11 Mark McLoughlin <mark@skynet.ie>
* dbus/dbus-connection-internal.h: rename
(add|remove|toggle)_(watch|timeout) to unlocked()
* dbus/dbus-connection.c: ditto.
* dbus/dbus-timeout.c, dbus/dbus-transport-unix.c:
Update some callers for the renaming.
2005-09-10 Mark McLoughlin <mark@skynet.ie>
* dbus/dbus-auth.c: (record_mechanisms): don't
retry the first auth mechanism because we know
we're just going to get rejected again.
* dbus/dbus-keyring.c: (_dbus_keyring_reload):
Fix thinko ... and what a nasty little bugger to
track down you were ...
* dbus/dbus-connection.c:
(_dbus_connection_add_watch),
(_dbus_connection_remove_watch): add note about
these needing the connection to be locked.
(_dbus_connection_get_dispatch_status_unlocked):
set status to DATA_REMAINS when we queue the
disconnected message.
* bus/dispatch.c:
(bus_dispatch): fix warning.
(check_existent_service_no_auto_start):
Expect ChildSignaled error too.
(check_existent_hello_from_self): fix another
couple of warnings.
Diffstat (limited to 'dbus/dbus-transport-unix.c')
| -rw-r--r-- | dbus/dbus-transport-unix.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index 4c07d5f3..f8af9c07 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -76,8 +76,8 @@ free_watches (DBusTransport *transport) if (unix_transport->read_watch) { if (transport->connection) - _dbus_connection_remove_watch (transport->connection, - unix_transport->read_watch); + _dbus_connection_remove_watch_unlocked (transport->connection, + unix_transport->read_watch); _dbus_watch_invalidate (unix_transport->read_watch); _dbus_watch_unref (unix_transport->read_watch); unix_transport->read_watch = NULL; @@ -86,8 +86,8 @@ free_watches (DBusTransport *transport) if (unix_transport->write_watch) { if (transport->connection) - _dbus_connection_remove_watch (transport->connection, - unix_transport->write_watch); + _dbus_connection_remove_watch_unlocked (transport->connection, + unix_transport->write_watch); _dbus_watch_invalidate (unix_transport->write_watch); _dbus_watch_unref (unix_transport->write_watch); unix_transport->write_watch = NULL; @@ -162,9 +162,9 @@ check_write_watch (DBusTransport *transport) unix_transport->fd, _dbus_connection_has_messages_to_send_unlocked (transport->connection)); - _dbus_connection_toggle_watch (transport->connection, - unix_transport->write_watch, - needed); + _dbus_connection_toggle_watch_unlocked (transport->connection, + unix_transport->write_watch, + needed); _dbus_transport_unref (transport); } @@ -222,9 +222,9 @@ check_read_watch (DBusTransport *transport) } _dbus_verbose (" setting read watch enabled = %d\n", need_read_watch); - _dbus_connection_toggle_watch (transport->connection, - unix_transport->read_watch, - need_read_watch); + _dbus_connection_toggle_watch_unlocked (transport->connection, + unix_transport->read_watch, + need_read_watch); _dbus_transport_unref (transport); } @@ -899,15 +899,15 @@ unix_connection_set (DBusTransport *transport) _dbus_connection_handle_watch, transport->connection, NULL); - if (!_dbus_connection_add_watch (transport->connection, - unix_transport->write_watch)) + if (!_dbus_connection_add_watch_unlocked (transport->connection, + unix_transport->write_watch)) return FALSE; - if (!_dbus_connection_add_watch (transport->connection, - unix_transport->read_watch)) + if (!_dbus_connection_add_watch_unlocked (transport->connection, + unix_transport->read_watch)) { - _dbus_connection_remove_watch (transport->connection, - unix_transport->write_watch); + _dbus_connection_remove_watch_unlocked (transport->connection, + unix_transport->write_watch); return FALSE; } |