Fixed bug #517761, Collection match rules not working for attributes.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@984 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 6e41aadd5f67fca758b6225b78bdee9e77d5f8ab..2058eb1fc0bb61b4b18447d9b4589a9be67c2219 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-22  Scott Haeger  <scott@bashautomation.com>
+
+        * libspi/collection.c:
+        Fixed bug #517761, Collection match rules not working for attributes.
+
 2008-02-19  Li Yuan  <li.yuan@sun.com>
 
        Patch from Scott Haeger <scott@bashautomation.com>

diff --git a/libspi/collection.c b/libspi/collection.c
index 6b95fa9cff2de4361d2c4a1bbcb6e57b89f42776..0ee571956eef73bb342f3aecbeb311cd7b1260ea 100644 (file)
--- a/libspi/collection.c
+++ b/libspi/collection.c
@@ -456,8 +456,10 @@ match_attributes_all_p (Accessibility_Accessible child, Accessibility_AttributeS
 
      for (i = 0; i < attributes->_length; i++){
          for (k = 0; k < oa->_length; k++)
-              if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer [i]))
+              if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer [i])){
                    flag = TRUE;
+                    break;
+               }
               else
                    flag = FALSE;
          if (!flag) 
@@ -485,8 +487,6 @@ match_attributes_any_p (Accessibility_Accessible child, Accessibility_AttributeS
      return FALSE;
 }
 
-
-
 static gboolean 
 match_attributes_none_p (Accessibility_Accessible child, Accessibility_AttributeSet  *attributes, CORBA_Environment *ev){
 
@@ -502,18 +502,11 @@ match_attributes_none_p (Accessibility_Accessible child, Accessibility_Attribute
      for (i = 0; i < attributes->_length; i++){
          for (k = 0; k < oa->_length; k++)
               if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer [i]))
-                   flag = FALSE;
-              else
-                   flag = TRUE;
-         if (flag) 
-              return TRUE; 
+                   return FALSE;
      }
-     return FALSE;
+     return TRUE;
 }
 
-
-
-
 static gboolean
 match_attributes_lookup (Accessibility_Accessible child, MatchRulePrivate *mrp, CORBA_Environment *ev){