Fix an errant g_object_unref

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / adaptors / collection-adaptor.c

diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c
index 2cd9a51..5633a5d 100644 (file)
--- a/atk-adaptor/adaptors/collection-adaptor.c
+++ b/atk-adaptor/adaptors/collection-adaptor.c
@@ -27,9 +27,9 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/bitarray.h"
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "bitarray.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 
 #include "accessible-register.h"
 #include "object.h"
@@ -39,13 +39,13 @@ typedef struct _MatchRulePrivate MatchRulePrivate;
 struct _MatchRulePrivate
 {
   gint *states;
-  Accessibility_Collection_MatchType statematchtype;
+  AtspiCollectionMatchType statematchtype;
   AtkAttributeSet *attributes;
-  Accessibility_Collection_MatchType attributematchtype;
+  AtspiCollectionMatchType attributematchtype;
   gint *roles;
-  Accessibility_Collection_MatchType rolematchtype;
+  AtspiCollectionMatchType rolematchtype;
   gchar **ifaces;
-  Accessibility_Collection_MatchType interfacematchtype;
+  AtspiCollectionMatchType interfacematchtype;
   gboolean invert;
 };
 
@@ -119,7 +119,7 @@ match_states_any_p (AtkObject * child, gint * set)
 
   for (i = 0; set[i] != BITARRAY_SEQ_TERM; i++)
     {
-      if (!atk_state_set_contains_state (chs, set[i]))
+      if (atk_state_set_contains_state (chs, set[i]))
         {
           ret = TRUE;
           break;
@@ -161,17 +161,17 @@ match_states_lookup (AtkObject * child, MatchRulePrivate * mrp)
 {
   switch (mrp->statematchtype)
     {
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_states_all_p (child, mrp->states))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_states_any_p (child, mrp->states))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_states_none_p (child, mrp->states))
         return TRUE;
       break;
@@ -202,7 +202,7 @@ match_roles_all_p (AtkObject * child, gint * roles)
 static gboolean
 match_roles_any_p (AtkObject * child, gint * roles)
 {
-  Accessibility_Role role;
+  AtspiRole role;
   int i;
 
   if (roles == NULL || roles[0] == BITARRAY_SEQ_TERM)
@@ -240,17 +240,17 @@ match_roles_lookup (AtkObject * child, MatchRulePrivate * mrp)
 {
   switch (mrp->rolematchtype)
     {
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_roles_all_p (child, mrp->roles))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_roles_any_p (child, mrp->roles))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_roles_none_p (child, mrp->roles))
         return TRUE;
       break;
@@ -313,17 +313,17 @@ match_interfaces_lookup (AtkObject * child, MatchRulePrivate * mrp)
   switch (mrp->interfacematchtype)
     {
 
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_interfaces_all_p (child, mrp->ifaces))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_interfaces_any_p (child, mrp->ifaces))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_interfaces_none_p (child, mrp->ifaces))
         return TRUE;
       break;
@@ -397,7 +397,7 @@ match_attributes_any_p (AtkObject * child, AtkAttributeSet * attributes)
       AtkAttribute *attr = g_slist_nth_data (attributes, i);
       for (k = 0; k < oa_length; k++)
         {
-          AtkAttribute *oa_attr = g_slist_nth_data (attributes, i);
+          AtkAttribute *oa_attr = g_slist_nth_data (oa, k);
           if (!g_ascii_strcasecmp (oa_attr->name, attr->name) &&
               !g_ascii_strcasecmp (oa_attr->value, attr->value))
             {
@@ -449,17 +449,17 @@ match_attributes_lookup (AtkObject * child, MatchRulePrivate * mrp)
   switch (mrp->attributematchtype)
     {
 
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_attributes_all_p (child, mrp->attributes))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_attributes_any_p (child, mrp->attributes))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_attributes_none_p (child, mrp->attributes))
         return TRUE;
       break;
@@ -583,7 +583,7 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
 }
 
 static int
-query_exec (MatchRulePrivate * mrp, Accessibility_Collection_SortOrder sortby,
+query_exec (MatchRulePrivate * mrp, AtspiCollectionSortOrder sortby,
             GList * ls, gint kount, gint max,
             AtkObject * obj, glong index,
             gboolean flag,
@@ -591,11 +591,11 @@ query_exec (MatchRulePrivate * mrp, Accessibility_Collection_SortOrder sortby,
 {
   switch (sortby)
     {
-    case Accessibility_Collection_SORT_ORDER_CANONICAL:
+    case ATSPI_Collection_SORT_ORDER_CANONICAL:
       kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag,
                                     pobj, recurse, traverse);
       break;
-    case Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL:
+    case ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL:
       kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag,
                                     pobj, recurse, traverse);
       break;
@@ -650,8 +650,6 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp)
   int array_count;
   AtkAttribute *attr;
   int i;
-  const char *str;
-  char *interfaces = NULL;
 
   dbus_message_iter_recurse (iter, &iter_struct);
 
@@ -676,14 +674,12 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp)
       const char *key, *val;
       dbus_message_iter_recurse (&iter_dict, &iter_dict_entry);
       dbus_message_iter_get_basic (&iter_dict_entry, &key);
+      dbus_message_iter_next (&iter_dict_entry);
       dbus_message_iter_get_basic (&iter_dict_entry, &val);
       attr = g_new (AtkAttribute, 1);
-      if (attr)
-        {
-          attr->name = g_strdup (key);
-          attr->value = g_strdup (val);
-          mrp->attributes = g_slist_prepend (mrp->attributes, attr);
-        }
+      attr->name = g_strdup (key);
+      attr->value = g_strdup (val);
+      mrp->attributes = g_slist_prepend (mrp->attributes, attr);
       dbus_message_iter_next (&iter_dict);
     }
   dbus_message_iter_next (&iter_struct);
@@ -763,30 +759,29 @@ static DBusMessage *
 GetMatchesFrom (DBusMessage * message,
                 AtkObject * current_object,
                 MatchRulePrivate * mrp,
-                const Accessibility_Collection_SortOrder sortby,
+                const AtspiCollectionSortOrder sortby,
                 const dbus_bool_t isrestrict,
                 dbus_int32_t count, const dbus_bool_t traverse)
 {
   GList *ls = NULL;
   AtkObject *parent;
   glong index = atk_object_get_index_in_parent (current_object);
-  gint kount = 0;
 
   ls = g_list_append (ls, current_object);
 
   if (!isrestrict)
     {
       parent = atk_object_get_parent (current_object);
-      kount = query_exec (mrp, sortby, ls, 0, count, parent, index,
-                          FALSE, NULL, TRUE, traverse);
+      query_exec (mrp, sortby, ls, 0, count, parent, index,
+                  FALSE, NULL, TRUE, traverse);
     }
   else
-    kount = query_exec (mrp, sortby, ls, 0, count,
-                        current_object, 0, FALSE, NULL, TRUE, traverse);
+    query_exec (mrp, sortby, ls, 0, count,
+                current_object, 0, FALSE, NULL, TRUE, traverse);
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -836,24 +831,23 @@ static DBusMessage *
 GetMatchesInOrder (DBusMessage * message,
                    AtkObject * current_object,
                    MatchRulePrivate * mrp,
-                   const Accessibility_Collection_SortOrder sortby,
+                   const AtspiCollectionSortOrder sortby,
                    const dbus_bool_t recurse,
                    dbus_int32_t count, const dbus_bool_t traverse)
 {
   GList *ls = NULL;
   AtkObject *obj;
-  gint kount = 0;
 
   ls = g_list_append (ls, current_object);
 
   obj = ATK_OBJECT(spi_register_path_to_object (spi_global_register, dbus_message_get_path (message)));
 
-  kount = inorder (obj, mrp, ls, 0, count,
-                   current_object, TRUE, NULL, traverse);
+  inorder (obj, mrp, ls, 0, count,
+           current_object, TRUE, NULL, traverse);
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -869,23 +863,22 @@ static DBusMessage *
 GetMatchesInBackOrder (DBusMessage * message,
                        AtkObject * current_object,
                        MatchRulePrivate * mrp,
-                       const Accessibility_Collection_SortOrder sortby,
+                       const AtspiCollectionSortOrder sortby,
                        dbus_int32_t count)
 {
   GList *ls = NULL;
   AtkObject *collection;
-  gint kount = 0;
 
   ls = g_list_append (ls, current_object);
 
   collection = ATK_OBJECT(spi_register_path_to_object (spi_global_register, dbus_message_get_path (message)));
 
-  kount = sort_order_rev_canonical (mrp, ls, 0, count, current_object,
-                                    FALSE, collection);
+  sort_order_rev_canonical (mrp, ls, 0, count, current_object,
+                            FALSE, collection);
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -896,33 +889,32 @@ static DBusMessage *
 GetMatchesTo (DBusMessage * message,
               AtkObject * current_object,
               MatchRulePrivate * mrp,
-              const Accessibility_Collection_SortOrder sortby,
+              const AtspiCollectionSortOrder sortby,
               const dbus_bool_t recurse,
               const dbus_bool_t isrestrict,
               dbus_int32_t count, const dbus_bool_t traverse)
 {
   GList *ls = NULL;
   AtkObject *obj;
-  gint kount = 0;
   ls = g_list_append (ls, current_object);
 
   if (recurse)
     {
       obj = ATK_OBJECT (atk_object_get_parent (current_object));
-      kount = query_exec (mrp, sortby, ls, 0, count,
-                          obj, 0, TRUE, current_object, TRUE, traverse);
+      query_exec (mrp, sortby, ls, 0, count,
+                  obj, 0, TRUE, current_object, TRUE, traverse);
     }
   else
     {
       obj = ATK_OBJECT (spi_register_path_to_object (spi_global_register, dbus_message_get_path (message)));
-      kount = query_exec (mrp, sortby, ls, 0, count,
-                          obj, 0, TRUE, current_object, TRUE, traverse);
+      query_exec (mrp, sortby, ls, 0, count,
+                  obj, 0, TRUE, current_object, TRUE, traverse);
 
     }
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby != Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby != ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -941,7 +933,6 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message,
   dbus_uint32_t tree;
   dbus_int32_t count;
   dbus_bool_t traverse;
-  GList *ls = NULL;
   const char *signature;
 
   signature = dbus_message_get_signature (message);
@@ -974,15 +965,15 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message,
 
   switch (tree)
     {
-    case Accessibility_Collection_TREE_RESTRICT_CHILDREN:
+    case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
       return GetMatchesFrom (message, current_object,
                              &rule, sortby, TRUE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_RESTRICT_SIBLING:
+    case ATSPI_Collection_TREE_RESTRICT_SIBLING:
       return GetMatchesFrom (message, current_object,
                              &rule, sortby, FALSE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_INORDER:
+    case ATSPI_Collection_TREE_INORDER:
       return GetMatchesInOrder (message, current_object,
                                 &rule, sortby, TRUE, count, traverse);
       break;
@@ -1004,7 +995,6 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message,
   dbus_bool_t recurse;
   dbus_int32_t count;
   dbus_bool_t traverse;
-  GList *ls = NULL;
   const char *signature;
 
   signature = dbus_message_get_signature (message);
@@ -1039,15 +1029,15 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message,
 
   switch (tree)
     {
-    case Accessibility_Collection_TREE_RESTRICT_CHILDREN:
+    case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
       return GetMatchesTo (message, current_object,
                            &rule, sortby, recurse, TRUE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_RESTRICT_SIBLING:
+    case ATSPI_Collection_TREE_RESTRICT_SIBLING:
       return GetMatchesTo (message, current_object,
                            &rule, sortby, recurse, FALSE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_INORDER:
+    case ATSPI_Collection_TREE_INORDER:
       return GetMatchesInBackOrder (message, current_object,
                                     &rule, sortby, count);
       break;
@@ -1090,7 +1080,7 @@ impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data)
                       obj, 0, TRUE, NULL, TRUE, traverse);
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
   free_mrp_data (&rule);
   return return_and_free_list (message, ls);
@@ -1107,5 +1097,5 @@ void
 spi_initialize_collection (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
 };