diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-02-01 22:02:27 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2003-02-01 22:02:27 +0000 |
| commit | f023895590208ea70ff7ac7444cc5e0729a3a815 (patch) | |
| tree | bf2355d54ac5f08d40cd60963e33c5928b2897fa | |
| parent | dbc4c0ca13fcc1cdf2be6c35a4559bc456243acb (diff) | |
| download | dbus-f023895590208ea70ff7ac7444cc5e0729a3a815.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | dbus/dbus-message.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-watch.c | 5 | ||||
| -rw-r--r-- | glib/dbus-gmain.c | 5 |
4 files changed, 20 insertions, 5 deletions
@@ -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 3bec8666..3fed70e6 100644 --- 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 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. 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); |