+2003-02-02 Alexander Larsson <alexl@redhat.com>
+
+ * 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
+
2003-02-01 Anders Carlsson <andersca@codefactory.se>
* bus/driver.c: (create_unique_client_name),
unsigned char * dbus_message_iter_get_byte_array (DBusMessageIter *iter,
int *len);
char ** dbus_message_iter_get_string_array (DBusMessageIter *iter,
- int *len)
+ int *len);
* 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.
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);