From f023895590208ea70ff7ac7444cc5e0729a3a815 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sat, 1 Feb 2003 22:02:27 +0000 Subject: 2003-02-02 Alexander Larsson * dbus/dbus-watch.c (dbus_watch_get_flags): Add note in the docs that ERROR or HANGUP won't be returned and are assumed always on. * glib/dbus-gmain.c (add_watch): Always add IO_ERR | IO_HUP * dbus/dbus-message.h: Add semicolon after dbus_message_iter_get_string_array(). Makes qt code build again --- glib/dbus-gmain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'glib') diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 5766139d..c5197e5e 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -148,10 +148,7 @@ add_watch (DBusWatch *watch, poll_fd->events |= G_IO_IN; if (flags & DBUS_WATCH_WRITABLE) poll_fd->events |= G_IO_OUT; - if (flags & DBUS_WATCH_ERROR) - poll_fd->events |= G_IO_ERR; - if (flags & DBUS_WATCH_HANGUP) - poll_fd->events |= G_IO_HUP; + poll_fd->events |= G_IO_ERR | G_IO_HUP; g_source_add_poll ((GSource *)dbus_source, poll_fd); -- cgit