2009-08-28 Mike Gorse <mgorse@novell.com>

[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..34a21de 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);
     }
@@ -65,7 +65,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
 {
   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,14 +75,14 @@ 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 *
@@ -90,7 +90,7 @@ 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);
     }
@@ -113,7 +113,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message,
 {
   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);
     }