Merge branch 'master' into mgorse

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

diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/component-adaptor.c
index d51c5fb..eeb36f9 100644 (file)
--- a/atk-adaptor/component-adaptor.c
+++ b/atk-adaptor/component-adaptor.c
@@ -26,14 +26,14 @@
 #include <droute/droute.h>
 
 #include "accessible-marshaller.h"
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
 
 static DBusMessage *
 impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_int32_t x, y;
-  dbus_int16_t coord_type;
+  dbus_uint32_t coord_type;
   DBusError error;
   dbus_bool_t retval;
   DBusMessage *reply;
@@ -44,7 +44,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
   dbus_error_init (&error);
   if (!dbus_message_get_args
       (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
-       DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+       DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -60,12 +60,12 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
+impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
                            void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_int32_t x, y;
-  dbus_int16_t coord_type;
+  dbus_uint32_t coord_type;
   DBusError error;
   AtkObject *child;
 
@@ -75,22 +75,22 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
   dbus_error_init (&error);
   if (!dbus_message_get_args
       (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
-       DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+       DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
   child =
     atk_component_ref_accessible_at_point (component, x, y,
                                            (AtkCoordType) coord_type);
-  return spi_dbus_return_object (message, child, TRUE);
+  return spi_dbus_return_object (message, child, TRUE, TRUE);
 }
 
 static DBusMessage *
-impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   DBusError error;
-  dbus_int16_t coord_type;
+  dbus_uint32_t coord_type;
   gint ix, iy, iwidth, iheight;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
@@ -98,7 +98,7 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 
   dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -108,12 +108,12 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getPosition (DBusConnection * bus, DBusMessage * message,
+impl_GetPosition (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   DBusError error;
-  dbus_int16_t coord_type;
+  dbus_uint32_t coord_type;
   gint ix = 0, iy = 0;
   dbus_int32_t x, y;
   DBusMessage *reply;
@@ -123,7 +123,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message,
 
   dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -140,7 +140,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   gint iwidth = 0, iheight = 0;
@@ -163,7 +163,7 @@ impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   AtkLayer atklayer;
@@ -212,7 +212,7 @@ impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message,
+impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
@@ -232,7 +232,7 @@ impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_grabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_bool_t rv;
@@ -266,7 +266,7 @@ impl_deregisterFocusHandler (DBusConnection * bus, DBusMessage * message,
 #endif
 
 static DBusMessage *
-impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   double rv;
@@ -287,16 +287,16 @@ impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
 
 static DRouteMethod methods[] = {
   {impl_contains, "contains"},
-  {impl_getAccessibleAtPoint, "getAccessibleAtPoint"},
-  {impl_getExtents, "getExtents"},
-  {impl_getPosition, "getPosition"},
-  {impl_getSize, "getSize"},
-  {impl_getLayer, "getLayer"},
-  {impl_getMDIZOrder, "getMDIZOrder"},
-  {impl_grabFocus, "grabFocus"},
+  {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
+  {impl_GetExtents, "GetExtents"},
+  {impl_GetPosition, "GetPosition"},
+  {impl_GetSize, "GetSize"},
+  {impl_GetLayer, "GetLayer"},
+  {impl_GetMDIZOrder, "GetMDIZOrder"},
+  {impl_GrabFocus, "GrabFocus"},
   //{impl_registerFocusHandler, "registerFocusHandler"},
   //{impl_deregisterFocusHandler, "deregisterFocusHandler"},
-  {impl_getAlpha, "getAlpha"},
+  {impl_GetAlpha, "GetAlpha"},
   {NULL, NULL}
 };