From 3df260c07102745c5606c313af862558f105f83e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 18 Apr 2003 04:18:57 +0000 Subject: 2003-04-18 Havoc Pennington * glib/dbus-gmain.c: adapt to watch changes * bus/bus.c, bus/activation.c, etc.: adjust to watch changes * dbus/dbus-server.h: remove dbus_server_handle_watch * dbus/dbus-connection.h: remove dbus_connection_handle_watch * dbus/dbus-watch.c (dbus_watch_handle): change DBusWatch to work like DBusTimeout, so we don't need dbus_connection_handle_watch etc. --- bus/bus.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bus/bus.c') diff --git a/bus/bus.c b/bus/bus.c index 385b3714..2b0f5091 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -122,9 +122,12 @@ server_watch_callback (DBusWatch *watch, unsigned int condition, void *data) { - DBusServer *server = data; - - return dbus_server_handle_watch (server, watch, condition); + /* FIXME this can be done in dbus-mainloop.c + * if the code in activation.c for the babysitter + * watch handler is fixed. + */ + + return dbus_watch_handle (watch, condition); } static dbus_bool_t -- cgit