* fix typos in Julio's previous patch which cause make check to fail

diff --git a/ChangeLog b/ChangeLog
index 893c296..5527506 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-10  John (J5) Palmieri  <johnp@redhat.com>
 
+       * dbus/dbus-signature.c:
+       fix typos in Julio's previous patch which cause make check to fail
+
+2006-08-10  John (J5) Palmieri  <johnp@redhat.com>
+
        * dbus/dbus-address.c (_dbus_address_test): Revert leaking strcmp.  
        In any case it was wrong since this is a test checking to see if
        address parsing is correct.  There was no need to get the true

diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index 9484c5f..2852ed4 100644 (file)
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -445,17 +445,17 @@ _dbus_signature_test (void)
   dbus_signature_iter_recurse (&iter, &subiter);
   dbus_signature_iter_recurse (&subiter, &subsubiter);
   _dbus_assert (dbus_signature_iter_get_current_type (&subsubiter) == DBUS_TYPE_INT16);
-  boolres = dbus_signature_iter_next (&subiter);
+  boolres = dbus_signature_iter_next (&subsubiter);
   _dbus_assert (boolres);
   _dbus_assert (dbus_signature_iter_get_current_type (&subsubiter) == DBUS_TYPE_STRING);
-  boolres = dbus_signature_iter_next (&subiter);
-  _dbus_assert (boolres);
+  boolres = dbus_signature_iter_next (&subsubiter);
+  _dbus_assert (!boolres);
 
   boolres = dbus_signature_iter_next (&iter);
   _dbus_assert (boolres);
   _dbus_assert (dbus_signature_iter_get_current_type (&iter) == DBUS_TYPE_VARIANT);
   boolres = dbus_signature_iter_next (&iter);
-  _dbus_assert (boolres);
+  _dbus_assert (!boolres);
 
   sig = DBUS_TYPE_DICT_ENTRY_AS_STRING;
   _dbus_assert (!dbus_signature_validate (sig, NULL));