diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-01-21 18:54:33 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-13 16:09:50 +0100 |
| commit | 4b43f5db7a3570978b49cb3adca3ca4afc95f8aa (patch) | |
| tree | 78b1aafc50f2101507c880c090cac769ac5d9f74 /bus/activation.c | |
| parent | 93385b733927bdcfd5c6e97f9684820aa9d3d4ae (diff) | |
| download | dbus-4b43f5db7a3570978b49cb3adca3ca4afc95f8aa.tar.gz | |
DBusLoop: remove second layer of watch callbacks where possible
Similar to the previous commit, almost every use of DBusWatch can just
have the main loop call dbus_watch_handle.
The one exception is the bus activation code; it's had a comment
explaining why it's wrong since 2003. We should fix that one day, but for
now, just migrate it to a new _dbus_loop_add_watch_full which preserves
the second-layer callback.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33342
Reviewed-by: Thiago Macieira <thiago@kde.org>
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/activation.c b/bus/activation.c index 31dbaf54..7ce463c3 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1427,9 +1427,9 @@ add_babysitter_watch (DBusWatch *watch, { BusPendingActivation *pending_activation = data; - return _dbus_loop_add_watch (bus_context_get_loop (pending_activation->activation->context), - watch, babysitter_watch_callback, pending_activation, - NULL); + return _dbus_loop_add_watch_full ( + bus_context_get_loop (pending_activation->activation->context), + watch, babysitter_watch_callback, pending_activation, NULL); } static void @@ -1439,7 +1439,7 @@ remove_babysitter_watch (DBusWatch *watch, BusPendingActivation *pending_activation = data; _dbus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context), - watch, babysitter_watch_callback, pending_activation); + watch); } static dbus_bool_t |