#include <droute/droute.h>
#include <gmodule.h>
+#include <glib/gi18n.h>
#include "bridge.h"
#include "event.h"
void **replyptr = (void **)user_data;
*replyptr = dbus_pending_call_steal_reply (pending);
+ dbus_pending_call_unref (pending);
}
/*---------------------------------------------------------------------------*/
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;
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;
}
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;
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);