Use the new 'Accessibility' bus if the bus address is available

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

diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/collection-adaptor.c
index 749198f..ec7640b 100644 (file)
--- a/atk-adaptor/collection-adaptor.c
+++ b/atk-adaptor/collection-adaptor.c
@@ -30,8 +30,9 @@
 #include "accessible-register.h"
 #include "accessible-marshaller.h"
 
-#include "spi-common/bitarray.h"
-#include "spi-common/spi-dbus.h"
+#include "common/bitarray.h"
+#include "common/spi-dbus.h"
+#include "common/spi-stateset.h"
 
 typedef struct _MatchRulePrivate MatchRulePrivate;
 struct _MatchRulePrivate
@@ -698,7 +699,7 @@ static void free_mrp_data(MatchRulePrivate *mrp)
 }
 
 static DBusMessage *
-getMatchesFrom (DBusMessage *message,
+GetMatchesFrom (DBusMessage *message,
                     AtkObject *current_object,
                     MatchRulePrivate *mrp,
                     const Accessibility_Collection_SortOrder sortby,
@@ -779,7 +780,7 @@ inorder (AtkObject *collection, MatchRulePrivate *mrp,
 */
 
 static DBusMessage *
-getMatchesInOrder (DBusMessage *message,
+GetMatchesInOrder (DBusMessage *message,
                   AtkObject *current_object,
                   MatchRulePrivate *mrp,
                   const Accessibility_Collection_SortOrder sortby,
@@ -813,7 +814,7 @@ getMatchesInOrder (DBusMessage *message,
 */
 
 static DBusMessage *
-getMatchesInBackOrder (DBusMessage *message,
+GetMatchesInBackOrder (DBusMessage *message,
                   AtkObject *current_object,
                   MatchRulePrivate *mrp,
                   const Accessibility_Collection_SortOrder sortby,
@@ -840,7 +841,7 @@ getMatchesInBackOrder (DBusMessage *message,
 }
 
 static DBusMessage *
-getMatchesTo (DBusMessage *message,
+GetMatchesTo (DBusMessage *message,
              AtkObject *current_object,
              MatchRulePrivate *mrp,
              const Accessibility_Collection_SortOrder sortby,
@@ -877,7 +878,7 @@ getMatchesTo (DBusMessage *message,
 }
 
 static DBusMessage *
-impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   char *current_object_path = NULL;
   AtkObject *current_object;
@@ -913,15 +914,15 @@ impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 
   switch (tree){
   case Accessibility_Collection_TREE_RESTRICT_CHILDREN : 
-    return getMatchesFrom (message, current_object, 
+    return GetMatchesFrom (message, current_object, 
                            &rule, sortby, TRUE, count, traverse);
     break;
   case Accessibility_Collection_TREE_RESTRICT_SIBLING :
-    return getMatchesFrom (message, current_object, 
+    return GetMatchesFrom (message, current_object, 
                            &rule, sortby, FALSE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_INORDER :
-    return getMatchesInOrder (message, current_object, 
+    return GetMatchesInOrder (message, current_object, 
                               &rule, sortby, TRUE, count, traverse); 
     break;
   default : return NULL;
@@ -929,7 +930,7 @@ impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   char *current_object_path = NULL;
   AtkObject *current_object;
@@ -968,15 +969,15 @@ impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 
   switch (tree){
   case Accessibility_Collection_TREE_RESTRICT_CHILDREN : 
-    return getMatchesTo (message, current_object, 
+    return GetMatchesTo (message, current_object, 
                          &rule, sortby, recurse, TRUE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_RESTRICT_SIBLING :
-    return getMatchesTo (message, current_object, 
+    return GetMatchesTo (message, current_object, 
                          &rule, sortby, recurse, FALSE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_INORDER :
-    return getMatchesInBackOrder (message, current_object, 
+    return GetMatchesInBackOrder (message, current_object, 
                                   &rule, sortby, count); 
     break;
   default : return NULL;
@@ -984,9 +985,9 @@ impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-  AtkObject *obj = path_to_object (message);
+  AtkObject *obj = atk_dbus_path_to_object (dbus_message_get_path (message));
   DBusMessageIter iter;
   MatchRulePrivate rule;
   dbus_uint16_t sortby;
@@ -1017,9 +1018,9 @@ impl_getMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  { impl_getMatchesFrom, "getMatchesFrom" },
-  { impl_getMatchesTo, "getMatchesTo" },
-  { impl_getMatches, "getMatches" },
+  { impl_GetMatchesFrom, "GetMatchesFrom" },
+  { impl_GetMatchesTo, "GetMatchesTo" },
+  { impl_GetMatches, "GetMatches" },
   {NULL, NULL}
 };