DBusLoop: remove second layer of watch callbacks where possible
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 21 Jan 2011 18:54:33 +0000 (18:54 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Jun 2011 15:09:50 +0000 (16:09 +0100)
commit4b43f5db7a3570978b49cb3adca3ca4afc95f8aa
tree78b1aafc50f2101507c880c090cac769ac5d9f74
parent93385b733927bdcfd5c6e97f9684820aa9d3d4ae
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>
bus/activation.c
bus/bus.c
bus/connection.c
bus/dir-watch-inotify.c
bus/dir-watch-kqueue.c
bus/main.c
bus/test.c
dbus/dbus-mainloop.c
dbus/dbus-mainloop.h
test/test-utils.c