diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-02-10 22:36:57 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-02-10 22:36:57 +0000 |
| commit | 13a283b705dd414d62ce7a7522c4ba622f98ec3d (patch) | |
| tree | 28158b256516afa7e42d19472251f362d1217038 | |
| parent | 3ebf7e7700e18dd0f5202d309138b60ea84906ab (diff) | |
2006-02-10 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly
deal with nested arrays (Bug #5823) Patch by Thiago Macieira
<thiago.macieira at trolltech.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dbus/dbus-signature.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2006-02-10 John (J5) Palmieri <johnp@redhat.com> + * dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly + deal with nested arrays (Bug #5823) Patch by Thiago Macieira + <thiago.macieira at trolltech.com> + +2006-02-10 John (J5) Palmieri <johnp@redhat.com> + * mono/doc/Makefile.am: Fix parallel make problem with mono-doc (Bug #4213) Patch from Doug Goldstein <cardoe at gentoo.org> diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c index a66b7191..8902b4ad 100644 --- a/dbus/dbus-signature.c +++ b/dbus/dbus-signature.c @@ -192,9 +192,10 @@ dbus_signature_iter_recurse (const DBusSignatureIter *iter, _dbus_return_if_fail (dbus_type_is_container (dbus_signature_iter_get_current_type (iter))); *real_sub_iter = *real_iter; + real_sub_iter->in_array = FALSE; real_sub_iter->pos++; - if (dbus_signature_iter_get_current_type (subiter) == DBUS_TYPE_ARRAY) + if (dbus_signature_iter_get_current_type (iter) == DBUS_TYPE_ARRAY) real_sub_iter->in_array = TRUE; } |