2009-07-06 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/image-adaptor.c
index 23bf365..500ea23 100644 (file)
--- a/atk-adaptor/image-adaptor.c
+++ b/atk-adaptor/image-adaptor.c
@@ -25,21 +25,21 @@
 #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_imageDescription (DBusMessageIter * iter,
-                          void *user_data)
+                           void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
   g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE);
   return droute_return_v_string (iter,
-                                atk_image_get_image_description (image));
+                                 atk_image_get_image_description (image));
 }
 
 static dbus_bool_t
 impl_get_imageLocale (DBusMessageIter * iter,
-                     void *user_data)
+                      void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
   g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE);
@@ -48,20 +48,20 @@ impl_get_imageLocale (DBusMessageIter * iter,
 
 static DBusMessage *
 impl_getImageExtents (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
+                      void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
   DBusError error;
-  dbus_int16_t coordType;
+  dbus_uint32_t coordType;
   gint ix, iy, iwidth, iheight;
 
   g_return_val_if_fail (ATK_IS_IMAGE (user_data),
                         droute_not_yet_handled_error (message));
   dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID))
+      (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_image_get_image_size (image, &iwidth, &iheight);
   atk_image_get_image_position (image, &ix, &iy, (AtkCoordType) coordType);
@@ -70,11 +70,11 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message,
 
 static DBusMessage *
 impl_getImagePosition (DBusConnection * bus, DBusMessage * message,
-                      void *user_data)
+                       void *user_data)
 {
   AtkImage *image = (AtkImage *) 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;
@@ -83,9 +83,9 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message,
                         droute_not_yet_handled_error (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 SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_image_get_image_position (image, &ix, &iy, (AtkCoordType) coord_type);
   x = ix;
@@ -94,14 +94,14 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message,
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32,
-                               &y, DBUS_TYPE_INVALID);
+                                &y, DBUS_TYPE_INVALID);
     }
   return reply;
 }
 
 static DBusMessage *
 impl_getImageSize (DBusConnection * bus, DBusMessage * message,
-                  void *user_data)
+                   void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
   gint iwidth = 0, iheight = 0;
@@ -117,7 +117,7 @@ impl_getImageSize (DBusConnection * bus, DBusMessage * message,
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_INT32, &width,
-                               DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
     }
   return reply;
 }