diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-14 11:53:09 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-14 11:53:09 +0000 |
| commit | 2adf484fb39853bfc4bc9a43fb73d0fc935e92c9 (patch) | |
| tree | 326b92827be4104196d956d41e8263d8e58c5661 /dbus/dbus-marshal-validate.c | |
| parent | 2c34514620c4b79ea4ec71d1db583379138d01ac (diff) | |
| download | dbus-2adf484fb39853bfc4bc9a43fb73d0fc935e92c9.tar.gz | |
Revert merge of master (dbus-1.5) into dbus-1.4
This reverts commits d1d395774435..09c9d6406b75f, keeping Lennart's
addition of UnknownInterface etc.
Diffstat (limited to 'dbus/dbus-marshal-validate.c')
| -rw-r--r-- | dbus/dbus-marshal-validate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index d87a27b9..4304467d 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -250,7 +250,7 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, if (last == DBUS_DICT_ENTRY_BEGIN_CHAR) { - if (!(dbus_type_is_valid (*p) && dbus_type_is_basic (*p))) + if (!(_dbus_type_is_valid (*p) && dbus_type_is_basic (*p))) { result = DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE; goto out; @@ -393,7 +393,7 @@ validate_body_helper (DBusTypeReader *reader, { int array_elem_type = _dbus_type_reader_get_element_type (reader); - if (!dbus_type_is_valid (array_elem_type)) + if (!_dbus_type_is_valid (array_elem_type)) { return DBUS_INVALID_UNKNOWN_TYPECODE; } |