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

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

diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/action-adaptor.c
index e9da657..8f3f565 100644 (file)
--- a/atk-adaptor/action-adaptor.c
+++ b/atk-adaptor/action-adaptor.c
@@ -25,10 +25,10 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_nActions (DBusMessageIter *iter, void *user_data)
+impl_get_NActions (DBusMessageIter *iter, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
 
@@ -50,7 +50,7 @@ impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data
                         droute_not_yet_handled_error (message));
   if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
   {
-    return spi_dbus_general_error (message);
+    return droute_invalid_arguments_error (message);
   }
   desc = atk_action_get_description(action, index);
   if (!desc) desc = "";
@@ -76,7 +76,7 @@ impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data)
                         droute_not_yet_handled_error (message));
   if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
   {
-    return spi_dbus_general_error (message);
+    return droute_invalid_arguments_error (message);
   }
   name = atk_action_get_name(action, index);
   if (!name) name = "";
@@ -102,7 +102,7 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data)
                         droute_not_yet_handled_error (message));
   if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
   {
-    return spi_dbus_general_error (message);
+    return droute_invalid_arguments_error (message);
   }
   kb = atk_action_get_keybinding(action, index);
   if (!kb) kb = "";
@@ -114,7 +114,7 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data)
   return reply;
 }
 
-static DBusMessage *impl_getActions(DBusConnection *bus, DBusMessage *message, void *user_data)
+static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
   DBusMessage *reply;
@@ -153,7 +153,7 @@ oom:
   return reply;
 }
 
-static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, void *user_data)
+static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
   DBusError error;
@@ -167,7 +167,7 @@ static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, voi
   if (!dbus_message_get_args
       (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   rv = atk_action_do_action(action, index);
   reply = dbus_message_new_method_return (message);
@@ -180,17 +180,17 @@ static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, voi
 
 DRouteMethod methods[] =
 {
-  { impl_get_description, "getDescription" },
-  { impl_get_name, "getName" },
-  { impl_get_keybinding, "getKeyBinding" },
-  {impl_getActions, "getActions"},
-  {impl_doAction, "doAction"},
+  { impl_get_description, "GetDescription" },
+  { impl_get_name, "GetName" },
+  { impl_get_keybinding, "GetKeyBinding" },
+  {impl_GetActions, "GetActions"},
+  {impl_DoAction, "DoAction"},
   {NULL, NULL }
 };
 
 static DRouteProperty properties[] =
 {
-  { impl_get_nActions, NULL, "nActions" },
+  { impl_get_NActions, NULL, "NActions" },
   { NULL, NULL }
 };