X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=cb14c8a6c98696db42d8c0e393f51d90c69e73de;hb=73469041fcbb7b5e81d4ca3877f6614795a69e50;hp=cbced24f7be394c8c1e1ce64d662623385374fad;hpb=3e0c62d4a264434cc5d49b5d4a054312c92330a0;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index cbced24..cb14c8a 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -210,24 +210,16 @@ register_application (SpiBridge * app) DBusMessageIter iter, iter_struct; gchar *app_name, *obj_path; - dbus_message_iter_init (reply, &iter); - dbus_message_iter_recurse (&iter, &iter_struct); - if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING)) + if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) { g_warning ("AT-SPI: Could not obtain desktop path or name\n"); return FALSE; } + + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_struct); dbus_message_iter_get_basic (&iter_struct, &app_name); - if (!dbus_message_iter_next (&iter_struct)) - { - g_warning ("AT-SPI: Could not obtain desktop name"); - return FALSE; - } - if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH)) - { - g_warning ("AT-SPI: Could not obtain desktop path"); - return FALSE; - } + dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &obj_path); app->desktop_name = g_strdup (app_name); @@ -450,7 +442,7 @@ adaptor_init (gint * argc, gchar ** argv[]) droute_new (spi_global_app_data->bus); treepath = droute_add_one (spi_global_app_data->droute, - "/org/at_spi/cache", spi_global_cache); + "/org/a11y/atspi/cache", spi_global_cache); if (!treepath) {