diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-07-16 16:05:16 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-07-16 16:05:16 +0200 |
| commit | 37019e9d271390fa8c62c1aae62d30bb9068adaa (patch) | |
| tree | 536d5838b73939a6a885f4ef61de1c18814b9529 /dbus/dbus-marshal-validate.c | |
| parent | 56f7ce147e82c7eb529ccba634013e97d53b23c0 (diff) | |
| parent | 9f06daccce3f4e75cfac7c97bfb1743affb55cb2 (diff) | |
Merge branch 'fd-passing'
Conflicts:
dbus/dbus-connection.c
dbus/dbus-message-util.c
dbus/dbus-sysdeps-unix.c
Diffstat (limited to 'dbus/dbus-marshal-validate.c')
| -rw-r--r-- | dbus/dbus-marshal-validate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index 61fad4de..bbaa9bdf 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -100,6 +100,7 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, case DBUS_TYPE_UINT16: case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: + case DBUS_TYPE_UNIX_FD: case DBUS_TYPE_INT64: case DBUS_TYPE_UINT64: case DBUS_TYPE_DOUBLE: @@ -319,12 +320,13 @@ validate_body_helper (DBusTypeReader *reader, case DBUS_TYPE_BYTE: ++p; break; - + case DBUS_TYPE_BOOLEAN: case DBUS_TYPE_INT16: case DBUS_TYPE_UINT16: case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: + case DBUS_TYPE_UNIX_FD: case DBUS_TYPE_INT64: case DBUS_TYPE_UINT64: case DBUS_TYPE_DOUBLE: |