From 5e8110d79aa8c11ad76b3e77791e3e6daca0fa32 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 11 Sep 2005 10:02:47 +0000 Subject: 2005-09-11 Mark McLoughlin * 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 * 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 * 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. --- dbus/dbus-timeout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dbus/dbus-timeout.c') diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c index bea86eb9..e684131e 100644 --- a/dbus/dbus-timeout.c +++ b/dbus/dbus-timeout.c @@ -123,8 +123,8 @@ _dbus_timeout_unref (DBusTimeout *timeout) /** * Changes the timeout interval. Note that you have to disable and * re-enable the timeout using the timeout toggle function - * (_dbus_connection_toggle_timeout() etc.) to notify the application - * of this change. + * (_dbus_connection_toggle_timeout_unlocked() etc.) to notify the + * application of this change. * * @param timeout the timeout * @param interval the new interval @@ -140,7 +140,7 @@ _dbus_timeout_set_interval (DBusTimeout *timeout, /** * Changes the timeout's enabled-ness. Note that you should use - * _dbus_connection_toggle_timeout() etc. instead, if + * _dbus_connection_toggle_timeout_unlocked() etc. instead, if * the timeout is passed out to an application main loop. * i.e. you can't use this function in the D-BUS library, it's * only used in the message bus daemon implementation. -- cgit