X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fadaptors%2Faccessible-adaptor.c;h=d0d77e73a74d455f6f06f188274ac14a102c4ed6;hb=3e6cf48cd7a24303324f10039b63bd916a8aa49e;hp=1983807a084e0441b08f96de1a56147d34fca0e4;hpb=73469041fcbb7b5e81d4ca3877f6614795a69e50;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c index 1983807..d0d77e7 100644 --- a/atk-adaptor/adaptors/accessible-adaptor.c +++ b/atk-adaptor/adaptors/accessible-adaptor.c @@ -145,7 +145,7 @@ impl_get_ChildCount (DBusMessageIter * iter, void *user_data) g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE); - childCount = (ATK_IS_SOCKET (object) && atk_socket_is_occupied (object)) + childCount = (ATK_IS_SOCKET (object) && atk_socket_is_occupied (ATK_SOCKET (object))) ? 1 : atk_object_get_n_accessible_children (object); return droute_return_v_int32 (iter, childCount); @@ -156,6 +156,7 @@ impl_GetChildAtIndex (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkObject *object = (AtkObject *) user_data; + DBusMessage *reply; DBusError error; dbus_int32_t i; AtkObject *child; @@ -177,7 +178,6 @@ impl_GetChildAtIndex (DBusConnection * bus, child_path = g_utf8_strchr (child_name + 1, -1, ':'); if (child_path) { - DBusMessage *reply; DBusMessageIter iter, iter_socket; *(child_path++) = '\0'; reply = dbus_message_new_method_return (message); @@ -194,7 +194,10 @@ impl_GetChildAtIndex (DBusConnection * bus, g_free (child_name); } child = atk_object_ref_accessible_child (object, i); - return spi_object_return_reference (message, child, TRUE); + reply = spi_object_return_reference (message, child); + g_object_unref (child); + + return reply; } static DBusMessage * @@ -495,8 +498,7 @@ static DBusMessage * impl_GetApplication (DBusConnection * bus, DBusMessage * message, void *user_data) { - AtkObject *root = g_object_ref (atk_get_root ()); - return spi_object_return_reference (message, root, TRUE); + return spi_object_return_reference (message, atk_get_root ()); } static DBusMessage * @@ -504,8 +506,6 @@ impl_GetInterfaces (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkObject *object = (AtkObject *) user_data; - gint role; - const char *role_name; DBusMessage *reply; DBusMessageIter iter, iter_array;