Ensure that DBus errors are freed

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

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index 12ad6af..64face9 100644 (file)
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -52,6 +52,16 @@ impl_get_Description (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
+impl_get_Locale (DBusMessageIter * iter, void *user_data)
+{
+  AtkObject *object = (AtkObject *) user_data;
+
+  g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE);
+
+  return droute_return_v_string (iter, atk_object_get_object_locale (object));
+}
+
+static dbus_bool_t
 impl_get_Parent (DBusMessageIter * iter, void *user_data)
 {
   AtkObject *obj = (AtkObject *) user_data;
@@ -134,15 +144,13 @@ impl_GetChildAtIndex (DBusConnection * bus,
 {
   AtkObject *object = (AtkObject *) user_data;
   DBusMessage *reply;
-  DBusError error;
   dbus_int32_t i;
   AtkObject *child;
 
-  dbus_error_init (&error);
   g_return_val_if_fail (ATK_IS_OBJECT (user_data),
                         droute_not_yet_handled_error (message));
   if (!dbus_message_get_args 
-       (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+       (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -217,7 +225,7 @@ impl_GetIndexInParent (DBusConnection * bus,
                        DBusMessage * message, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
-  dbus_uint32_t rv;
+  dbus_int32_t rv;
   DBusMessage *reply;
 
   g_return_val_if_fail (ATK_IS_OBJECT (user_data),
@@ -225,7 +233,7 @@ impl_GetIndexInParent (DBusConnection * bus,
 
   rv = atk_object_get_index_in_parent (object);
   reply = dbus_message_new_method_return (message);
-  dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID);
+  dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, DBUS_TYPE_INVALID);
   return reply;
 }
 
@@ -328,7 +336,6 @@ impl_GetRelationSet (DBusConnection * bus,
       for (j = 0; j < target->len; j++)
         {
           AtkObject *obj = target->pdata[j];
-          char *path;
           if (!obj)
             continue;
           spi_object_append_reference (&iter_targets, obj);
@@ -338,6 +345,8 @@ impl_GetRelationSet (DBusConnection * bus,
     }
   dbus_message_iter_close_container (&iter, &iter_array);
 oom:
+  if (set)
+    g_object_unref (set);
   // TODO: handle out of memory */
   return reply;
 }
@@ -363,15 +372,6 @@ impl_GetRole (DBusConnection * bus, DBusMessage * message, void *user_data)
   return reply;
 }
 
-static char *
-impl_get_role_str (void *datum)
-{
-  g_return_val_if_fail (ATK_IS_OBJECT (datum), g_strdup (""));
-  return g_strdup_printf ("%d",
-                          spi_accessible_role_from_atk_role
-                          (atk_object_get_role ((AtkObject *) datum)));
-}
-
 static DBusMessage *
 impl_GetRoleName (DBusConnection * bus,
                   DBusMessage * message, void *user_data)
@@ -519,6 +519,7 @@ static DRouteMethod methods[] = {
 static DRouteProperty properties[] = {
   {impl_get_Name, NULL, "Name"},
   {impl_get_Description, NULL, "Description"},
+  {impl_get_Locale, NULL, "Locale"},
   {impl_get_Parent, NULL, "Parent"},
   {impl_get_ChildCount, NULL, "ChildCount"},
   {NULL, NULL, NULL}