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 --- dbus/dbus-watch.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dbus/dbus-watch.c') diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c index 78001612..681da939 100644 --- a/dbus/dbus-watch.c +++ b/dbus/dbus-watch.c @@ -330,6 +330,11 @@ dbus_watch_get_fd (DBusWatch *watch) * Gets flags from DBusWatchFlags indicating * what conditions should be monitored on the * file descriptor. + * + * The flags returned will only contain DBUS_WATCH_READABLE + * and DBUS_WATCH_WRITABLE, never DBUS_WATCH_HANGUP or + * DBUS_WATCH_ERROR; all watches implicitly include a watch + * for hangups, errors, and other exceptional conditions. * * @param watch the DBusWatch object. * @returns the conditions to watch. -- cgit