X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fadaptors%2Fcomponent-adaptor.c;h=76b0f7c93b1cce930c8c7b59f84977c263534e64;hp=3db9717c8a09f78ce25958f69111745588f06b1d;hb=44ef97e0fe7b6827a7945fb31736e479fadbb938;hpb=a0c12e455cf1da0273c7dbd9a3825be02b2140b9

diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
index 3db9717..76b0f7c 100644
--- a/atk-adaptor/adaptors/component-adaptor.c
+++ b/atk-adaptor/adaptors/component-adaptor.c
@@ -26,26 +26,24 @@
 #include <droute/droute.h>
 #include <string.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
 static DBusMessage *
-impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_int32_t x, y;
   dbus_uint32_t coord_type;
-  DBusError error;
   dbus_bool_t retval;
   DBusMessage *reply;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+      (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
        DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
@@ -69,15 +67,13 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
   dbus_int32_t x, y;
   dbus_uint32_t coord_type;
   DBusMessage *reply;
-  DBusError error;
   AtkObject *child;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+      (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
        DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
@@ -86,7 +82,8 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
     atk_component_ref_accessible_at_point (component, x, y,
                                            (AtkCoordType) coord_type);
   reply = spi_object_return_reference (message, child);
-  g_object_unref (child);
+  if (child)
+    g_object_unref (child);
 
   return reply;
 }
@@ -95,16 +92,14 @@ static DBusMessage *
 impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
-  DBusError error;
   dbus_uint32_t coord_type;
   gint ix, iy, iwidth, iheight;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -118,7 +113,6 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
-  DBusError error;
   dbus_uint32_t coord_type;
   gint ix = 0, iy = 0;
   dbus_int32_t x, y;
@@ -127,9 +121,8 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -184,28 +177,28 @@ impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
   switch (atklayer)
     {
     case ATK_LAYER_BACKGROUND:
-      rv = Accessibility_LAYER_BACKGROUND;
+      rv = ATSPI_LAYER_BACKGROUND;
       break;
     case ATK_LAYER_CANVAS:
-      rv = Accessibility_LAYER_CANVAS;
+      rv = ATSPI_LAYER_CANVAS;
       break;
     case ATK_LAYER_WIDGET:
-      rv = Accessibility_LAYER_WIDGET;
+      rv = ATSPI_LAYER_WIDGET;
       break;
     case ATK_LAYER_MDI:
-      rv = Accessibility_LAYER_MDI;
+      rv = ATSPI_LAYER_MDI;
       break;
     case ATK_LAYER_POPUP:
-      rv = Accessibility_LAYER_POPUP;
+      rv = ATSPI_LAYER_POPUP;
       break;
     case ATK_LAYER_OVERLAY:
-      rv = Accessibility_LAYER_OVERLAY;
+      rv = ATSPI_LAYER_OVERLAY;
       break;
     case ATK_LAYER_WINDOW:
-      rv = Accessibility_LAYER_WINDOW;
+      rv = ATSPI_LAYER_WINDOW;
       break;
     default:
-      rv = Accessibility_LAYER_INVALID;
+      rv = ATSPI_LAYER_INVALID;
       break;
     }
   reply = dbus_message_new_method_return (message);
@@ -252,7 +245,7 @@ impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
+      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
                                 DBUS_TYPE_INVALID);
     }
   return reply;
@@ -397,7 +390,7 @@ impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  {impl_contains, "contains"},
+  {impl_Contains, "Contains"},
   {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
   {impl_GetExtents, "GetExtents"},
   {impl_GetPosition, "GetPosition"},
@@ -418,5 +411,5 @@ void
 spi_initialize_component (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
 };