diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-message.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-watch.c | 5 |
2 files changed, 6 insertions, 1 deletions
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. |