X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=8bad17c954cd027c4c97c27197fc08a4f2ac0e50;hb=df5695a948da0886dd506430959d4de88a940eb9;hp=5b697a013cad8886b3b83cbc610f21fcd04cae72;hpb=c3917234bd94cf1ed37369c9392c1031d0bbcdaa;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 5b697a0..8bad17c 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -36,11 +36,14 @@ #include #include +#include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" #include "object.h" +#include "common/spi-stateset.h" #include "accessible-register.h" #include "accessible-leasing.h" @@ -149,6 +152,7 @@ spi_atk_bridge_get_bus (void) else { bus = dbus_connection_open (data, &error); + XFree (data); if (!bus) { g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); @@ -161,6 +165,7 @@ spi_atk_bridge_get_bus (void) g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message); return NULL; } + dbus_connection_set_exit_on_disconnect (bus, FALSE); } } @@ -173,6 +178,7 @@ set_reply (DBusPendingCall *pending, void *user_data) void **replyptr = (void **)user_data; *replyptr = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); } /*---------------------------------------------------------------------------*/ @@ -210,6 +216,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; @@ -225,10 +232,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); @@ -236,8 +240,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); } @@ -248,7 +252,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; @@ -304,7 +309,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; } @@ -314,12 +320,17 @@ 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/", S_IRWXU); -app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); -sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), -rand()); + /* 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; } @@ -515,20 +526,27 @@ new_connection_cb (DBusServer *server, DBusConnection *con, void *data) 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); - - /* is there a better way to handle this */ 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; } @@ -601,6 +619,8 @@ remove_events (const char *bus_name, const char *event) list = list->next; } } + + g_strfreev (remove_data); } static void @@ -683,6 +703,7 @@ adaptor_init (gint * argc, gchar ** argv[]) 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_option_context_free (opt); /* Allocate global data and do ATK initializations */ spi_global_app_data = g_new0 (SpiBridge, 1); @@ -715,7 +736,11 @@ adaptor_init (gint * argc, gchar ** argv[]) } } +#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); @@ -790,8 +815,6 @@ adaptor_init (gint * argc, gchar ** argv[]) setup_bus(); - g_atexit (exit_func); - return 0; } @@ -809,6 +832,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) {