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. --- glib/dbus-gmain.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'glib') diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index b00320f2..3a90ee3d 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -153,7 +153,7 @@ dbus_gsource_dispatch (GSource *source, GList *copy, *list; /* We need to traverse a copy of the list, since it can change in - dbus_connect_handle_watch. */ + dbus_watch_handle(). */ copy = g_list_copy (dbus_source->poll_fds); list = copy; @@ -175,12 +175,7 @@ dbus_gsource_dispatch (GSource *source, if (poll_fd->revents & G_IO_HUP) condition |= DBUS_WATCH_HANGUP; - if (is_server) - dbus_server_handle_watch (dbus_source->connection_or_server, - watch, condition); - else - dbus_connection_handle_watch (dbus_source->connection_or_server, - watch, condition); + dbus_watch_handle (watch, condition); } list = list->next; -- cgit