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

diff --git a/ChangeLog b/ChangeLog
index 649dd6cf7710b789768f9f5849aa1ec735b8e972..ecebd0d56759b4271e38313817f0e9f85c627c73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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),

diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 3bec86667d18e64086e93b757512e1bfcd085909..3fed70e6332fedb0081d22bae127a0c64490d65b 100644 (file)
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -99,7 +99,7 @@ char *           dbus_message_iter_get_string     (DBusMessageIter *iter);
 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);
 
 
 

diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 78001612a0cdaa27b142b3dba4cd71c42de1b0f9..681da9397d6ade0cde5151ee1c6d49fe73a76e88 100644 (file)
--- 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.

diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 5766139d64311ad6f0f3da07f6848e11b9dd7281..c5197e5e03448f82ba908b59107ec3214ba2f5c0 100644 (file)
--- 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);