#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
}
static DBusMessage *
-getMatchesFrom (DBusMessage *message,
+GetMatchesFrom (DBusMessage *message,
AtkObject *current_object,
MatchRulePrivate *mrp,
const Accessibility_Collection_SortOrder sortby,
*/
static DBusMessage *
-getMatchesInOrder (DBusMessage *message,
+GetMatchesInOrder (DBusMessage *message,
AtkObject *current_object,
MatchRulePrivate *mrp,
const Accessibility_Collection_SortOrder sortby,
*/
static DBusMessage *
-getMatchesInBackOrder (DBusMessage *message,
+GetMatchesInBackOrder (DBusMessage *message,
AtkObject *current_object,
MatchRulePrivate *mrp,
const Accessibility_Collection_SortOrder sortby,
}
static DBusMessage *
-getMatchesTo (DBusMessage *message,
+GetMatchesTo (DBusMessage *message,
AtkObject *current_object,
MatchRulePrivate *mrp,
const Accessibility_Collection_SortOrder sortby,
}
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;
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;
}
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;
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;
}
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;
}
static DRouteMethod methods[] = {
- { impl_getMatchesFrom, "getMatchesFrom" },
- { impl_getMatchesTo, "getMatchesTo" },
- { impl_getMatches, "getMatches" },
+ { impl_GetMatchesFrom, "GetMatchesFrom" },
+ { impl_GetMatchesTo, "GetMatchesTo" },
+ { impl_GetMatches, "GetMatches" },
{NULL, NULL}
};