dbus/dbus dbus-signature.c,1.5,1.6

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv21909/dbus

Modified Files:
	dbus-signature.c 
Log Message:
2006-02-10  John (J5) Palmieri  <johnp at 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>


Index: dbus-signature.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-signature.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbus-signature.c	31 Jul 2005 02:09:15 -0000	1.5
+++ dbus-signature.c	10 Feb 2006 22:36:57 -0000	1.6
@@ -192,9 +192,10 @@
   _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;
 }