Fix deadlock with key event listeners in our own process

[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 25d7823..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);
     }
@@ -337,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;
 }
@@ -509,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}