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>

diff --git a/ChangeLog b/ChangeLog
index a5c85d6..262b8c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a66b719..8902b4a 100644 (file)
--- 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;
 }