summaryrefslogtreecommitdiffstats
path: root/bus/bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'bus/bus.c')
-rw-r--r--bus/bus.c9
1 files changed, 6 insertions, 3 deletions
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