X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=d03f0c36423babbffc984faea7b531701f1eba55;hb=f6a0fdcf50c5bcbab547996313161ee4200266e4;hp=6a2ba1596fbe792d8c207854e505cd24fc24cd47;hpb=98fa500555aaef2ada618a9e55bf97243d28247e;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 6a2ba15..d03f0c3 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -37,6 +37,7 @@ #include #include +#include #include "bridge.h" #include "event.h" @@ -174,6 +175,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); } /*---------------------------------------------------------------------------*/ @@ -247,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; @@ -303,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; } @@ -313,13 +317,16 @@ 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)); + /* 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()); + 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; @@ -522,10 +529,15 @@ setup_bus (void) 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);