X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=74f0431d12d0b7c09ce6fa480dc3b21b7b45adc7;hp=98806398ef0d4ca9c5aeb34841febca075033a38;hb=b3210d247daa9480d3037bac4d7cc1963883abea;hpb=7fc3c0ed67c52371855c5db456f26f27dfd22126 diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 9880639..74f0431 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -249,7 +249,9 @@ register_reply (DBusPendingCall *pending, void *user_data) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &obj_path); + g_free (app->desktop_name); app->desktop_name = g_strdup (app_name); + g_free (app->desktop_path); app->desktop_path = g_strdup (obj_path); } } @@ -275,8 +277,8 @@ register_application (SpiBridge * app) /* These will be overridden when we get a reply, but in practice these defaults should always be correct */ - app->desktop_name = ATSPI_DBUS_NAME_REGISTRY; - app->desktop_path = ATSPI_DBUS_PATH_ROOT; + app->desktop_name = g_strdup (ATSPI_DBUS_NAME_REGISTRY); + app->desktop_path = g_strdup (ATSPI_DBUS_PATH_ROOT); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_ROOT, @@ -289,6 +291,10 @@ register_application (SpiBridge * app) if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) || !pending) { + if (pending) + dbus_pending_call_unref (pending); + + dbus_message_unref (message); return FALSE; } @@ -297,26 +303,6 @@ register_application (SpiBridge * app) if (message) dbus_message_unref (message); -#ifndef DISABLE_P2P - if (getuid () != 0) - { - app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), - "at-spi2-XXXXXX", NULL); - if (!g_mkdtemp (app->app_tmp_dir)) - { - g_free (app->app_tmp_dir); - app->app_tmp_dir = NULL; - return FALSE; - } - } - - if (app->app_tmp_dir) - app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); - else - app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d", - g_get_user_runtime_dir (), getpid ()); -#endif - return TRUE; } @@ -359,6 +345,11 @@ deregister_application (SpiBridge * app) g_free (app->app_tmp_dir); app->app_tmp_dir = NULL; } + + g_free (app->desktop_name); + app->desktop_name = NULL; + g_free (app->desktop_path); + app->desktop_path = NULL; } /*---------------------------------------------------------------------------*/ @@ -539,37 +530,6 @@ new_connection_cb (DBusServer *server, DBusConnection *con, void *data) spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); } -static int -setup_bus (void) -{ -#ifndef DISABLE_P2P - DBusServer *server; - DBusError err; - - if (!spi_global_app_data->app_bus_addr) - return -1; - - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); - if (server == NULL) - { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); - dbus_error_init (&err); - spi_global_app_data->app_bus_addr [0] = '\0'; - g_main_context_unref (spi_global_app_data->main_context); - spi_global_app_data->main_context = NULL; - return -1; - } - - atspi_dbus_server_setup_with_g_main(server, NULL); - dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); - - spi_global_app_data->server = server; -#endif - - return 0; -} - gchar *atspi_dbus_name = NULL; static gboolean atspi_no_register = FALSE; @@ -626,11 +586,20 @@ remove_events (const char *bus_name, const char *event) spi_event_is_subtype (evdata->data, remove_data)) { GList *events = spi_global_app_data->events; - list = list->next; g_strfreev (evdata->data); g_free (evdata->bus_name); g_free (evdata); - spi_global_app_data->events = g_list_remove (events, evdata); + if (list->prev) + { + GList *next = list->next; + list->prev = g_list_remove (list->prev, evdata); + list = next; + } + else + { + spi_global_app_data->events = g_list_remove (events, evdata); + list = spi_global_app_data->events; + } } else { @@ -724,6 +693,55 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) return result; } +int +spi_atk_create_socket (SpiBridge *app) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + if (getuid () != 0) + { + app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), + "at-spi2-XXXXXX", NULL); + if (!g_mkdtemp (app->app_tmp_dir)) + { + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + return FALSE; + } + } + + if (app->app_tmp_dir) + app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); + else + app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d", + g_get_user_runtime_dir (), getpid ()); + + if (!spi_global_app_data->app_bus_addr) + return -1; + + dbus_error_init(&err); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + if (server == NULL) + { + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); + dbus_error_init (&err); + spi_global_app_data->app_bus_addr [0] = '\0'; + g_main_context_unref (spi_global_app_data->main_context); + spi_global_app_data->main_context = NULL; + return -1; + } + + atspi_dbus_server_setup_with_g_main(server, NULL); + dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); + + spi_global_app_data->server = server; +#endif + + return 0; +} + /* * Checks the status of the environment variables * @@ -745,6 +763,27 @@ check_envvar (void) return TRUE; } +void +spi_atk_activate () +{ + DRoutePath *treepath; + + spi_atk_register_event_listeners (); + if (!spi_global_cache) + { + spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); + treepath = droute_add_one (spi_global_app_data->droute, + "/org/a11y/atspi/cache", spi_global_cache); + + if (!treepath) + { + g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); + return; + } + spi_initialize_cache (treepath); + } +} + /* * spi_app_init * @@ -764,7 +803,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) DBusError error; AtkObject *root; gboolean load_bridge; - DRoutePath *treepath, *accpath; + DRoutePath *accpath; load_bridge = check_envvar (); if (inited && !load_bridge) @@ -788,7 +827,10 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) g_option_context_add_main_entries (opt, atspi_option_entries, NULL); g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, argc, argv, &err)) - g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + { + g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + g_error_free (err); + } g_option_context_free (opt); /* Allocate global data and do ATK initializations */ @@ -835,21 +877,11 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) */ spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL); spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL); - spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = droute_new (); - treepath = droute_add_one (spi_global_app_data->droute, - "/org/a11y/atspi/cache", spi_global_cache); - - if (!treepath) - { - g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); - return -1; - } - accpath = droute_add_many (spi_global_app_data->droute, "/org/a11y/atspi/accessible", NULL, @@ -860,7 +892,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Register all interfaces with droute and set up application accessible db */ - spi_initialize_cache (treepath); spi_initialize_accessible (accpath); spi_initialize_application (accpath); spi_initialize_action (accpath); @@ -882,7 +913,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Register methods to send D-Bus signals on certain ATK events */ if (clients) - spi_atk_register_event_listeners (); + spi_atk_activate (); /* Set up filter and match rules to catch signals */ dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL); @@ -896,8 +927,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); - setup_bus(); - return 0; } @@ -921,7 +950,9 @@ atk_bridge_adaptor_cleanup (void) { dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL); droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus); + dbus_connection_close (spi_global_app_data->bus); dbus_connection_unref (spi_global_app_data->bus); + spi_global_app_data->bus = NULL; } for (l = spi_global_app_data->direct_connections; l; l = l->next) @@ -932,18 +963,20 @@ atk_bridge_adaptor_cleanup (void) droute_context_unregister (spi_global_app_data->droute, connection); droute_unintercept_dbus (connection); + dbus_connection_close (connection); dbus_connection_unref (connection); } g_list_free (spi_global_app_data->direct_connections); + spi_global_app_data->direct_connections = NULL; for (ls = clients; ls; ls = ls->next) - g_free (l->data); + g_free (ls->data); g_slist_free (clients); clients = NULL; - g_object_unref (spi_global_cache); - g_object_unref (spi_global_leasing); - g_object_unref (spi_global_register); + g_clear_object (&spi_global_cache); + g_clear_object (&spi_global_leasing); + g_clear_object (&spi_global_register); if (spi_global_app_data->main_context) g_main_context_unref (spi_global_app_data->main_context); @@ -973,7 +1006,7 @@ spi_atk_add_client (const char *bus_name) return; } if (!clients) - spi_atk_register_event_listeners (); + spi_atk_activate (); clients = g_slist_append (clients, g_strdup (bus_name)); match = g_strdup_printf (name_match_tmpl, bus_name); dbus_bus_add_match (spi_global_app_data->bus, match, NULL); @@ -1000,6 +1033,7 @@ spi_atk_remove_client (const char *bus_name) clients = g_slist_delete_link (clients, l); if (!clients) spi_atk_deregister_event_listeners (); + return; } l = next_node;