X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=d03f0c36423babbffc984faea7b531701f1eba55;hb=f6a0fdcf50c5bcbab547996313161ee4200266e4;hp=356b5fc4423ff3a9a95bc76c17608bd2d15d0ec4;hpb=04e3cb2489a765fee0e24f92f9ba2048f81edf81;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 356b5fc..d03f0c3 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -32,9 +32,12 @@ #include #include #include +#include #include #include +#include +#include #include "bridge.h" #include "event.h" @@ -172,25 +175,9 @@ set_reply (DBusPendingCall *pending, void *user_data) void **replyptr = (void **)user_data; *replyptr = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); } -static DBusMessage * -send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) -{ - DBusPendingCall *pending; - DBusMessage *reply = NULL; - - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) - { - return NULL; - } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - while (!reply) - { - if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL; - } - return reply; -} /*---------------------------------------------------------------------------*/ static void @@ -226,6 +213,7 @@ get_registered_event_listeners (SpiBridge *app) SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_REGISTRY, "GetRegisteredEvents"); + spi_global_app_data->events_initialized = TRUE; if (!message) return; @@ -241,10 +229,7 @@ get_registered_event_listeners (SpiBridge *app) } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); - /* TODO: This is bad. Need to determine that the array is non-empty, - so that we don't initially read a value rom it in that case, but using - a deprecated function. */ - if (dbus_message_iter_get_array_len (&iter_array) > 0) do + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { char *bus_name, *event; dbus_message_iter_recurse (&iter_array, &iter_struct); @@ -252,8 +237,8 @@ get_registered_event_listeners (SpiBridge *app) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &event); add_event (bus_name, event); + dbus_message_iter_next (&iter_array); } - while (dbus_message_iter_next (&iter_array)); dbus_message_unref (reply); } @@ -264,7 +249,8 @@ register_reply (DBusPendingCall *pending, void *user_data) SpiBridge *app = user_data; DBusMessage *message; - reply = dbus_pending_call_steal_reply (pending); + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); if (reply) { gchar *app_name, *obj_path; @@ -272,7 +258,6 @@ register_reply (DBusPendingCall *pending, void *user_data) if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) { g_warning ("AT-SPI: Could not obtain desktop path or name\n"); -printf("sig: %s\n", dbus_message_get_signature(reply)); } else { @@ -304,6 +289,7 @@ register_application (SpiBridge * app) DBusMessageIter iter; DBusError error; DBusPendingCall *pending; + const int max_addr_length = 128; /* should be long enough */ dbus_error_init (&error); @@ -320,7 +306,8 @@ register_application (SpiBridge * app) dbus_message_iter_init_append (message, &iter); spi_object_append_reference (&iter, app->root); - if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) + || !pending) { return FALSE; } @@ -330,16 +317,18 @@ register_application (SpiBridge * app) if (message) dbus_message_unref (message); -/* could this be better, we accept some amount of race in getting the temp name*/ -/* make sure the directory exists */ -mkdir("/tmp/at-spi2/", 0); -app->app_bus_addr = mktmp("/tmp/at-spi2/app-socket-xxxxxx"); - } - else - { - g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message); - return FALSE; - } + /* could this be better, we accept some amount of race in getting the temp name*/ + /* make sure the directory exists */ + mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); +#ifndef DISABLE_P2P + sprintf (app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), + rand()); +#else + app->app_bus_addr [0] = '\0'; +#endif + return TRUE; } @@ -516,27 +505,47 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } -static void new_connection_cb(DBusServer *server, DBusConnection *con, void *data) -{ -dbus_connection_ref(con); -dbus_connection_setup_with_g_main(con, NULL); -} - -static int setup_bus(void) +static void +new_connection_cb (DBusServer *server, DBusConnection *con, void *data) { -DBusServer *server; -DBusError err; + GList *new_list; -dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + dbus_connection_ref(con); + dbus_connection_setup_with_g_main(con, NULL); + droute_intercept_dbus (con); + droute_context_register (spi_global_app_data->droute, con); -/* is there a better way to handle this */ -if(server == NULL) return -1; + new_list = g_list_append (spi_global_app_data->direct_connections, con); + if (new_list) + spi_global_app_data->direct_connections = new_list; +} -dbus_server_setup_with_g_main(server, NULL); -dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); +static int +setup_bus (void) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + 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; + } + + 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; + return 0; } @@ -721,8 +730,13 @@ adaptor_init (gint * argc, gchar ** argv[]) } } - dbus_connection_setup_with_g_main (spi_global_app_data->bus, - g_main_context_default ()); +#ifndef DISABLE_P2P + spi_global_app_data->main_context = g_main_context_new (); +#else + spi_global_app_data->main_context = NULL; +#endif + + dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -738,7 +752,7 @@ adaptor_init (gint * argc, gchar ** argv[]) /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = - droute_new (spi_global_app_data->bus); + droute_new (); treepath = droute_add_one (spi_global_app_data->droute, "/org/a11y/atspi/cache", spi_global_cache); @@ -776,6 +790,9 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_initialize_text (accpath); spi_initialize_value (accpath); + droute_context_register (spi_global_app_data->droute, + spi_global_app_data->bus); + /* Register methods to send D-Bus signals on certain ATK events */ spi_atk_register_event_listeners (); @@ -792,8 +809,6 @@ adaptor_init (gint * argc, gchar ** argv[]) setup_bus(); - g_atexit (exit_func); - return 0; } @@ -811,6 +826,14 @@ gtk_module_init (gint * argc, gchar ** argv[]) return 0; } +gchar* +g_module_check_init (GModule *module) +{ + g_module_make_resident (module); + + return NULL; +} + void gnome_accessibility_module_init (void) {