#include <droute/droute.h>
#include <gmodule.h>
+#include <glib/gi18n.h>
#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"
else
{
bus = dbus_connection_open (data, &error);
+ XFree (data);
if (!bus)
{
g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
void **replyptr = (void **)user_data;
*replyptr = dbus_pending_call_steal_reply (pending);
+ dbus_pending_call_unref (pending);
}
/*---------------------------------------------------------------------------*/
SPI_DBUS_PATH_REGISTRY,
SPI_DBUS_INTERFACE_REGISTRY,
"GetRegisteredEvents");
+ spi_global_app_data->events_initialized = TRUE;
if (!message)
return;
}
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);
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);
}
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));
-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;
}
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;
}
list = list->next;
}
}
+
+ g_strfreev (remove_data);
}
static void
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);
}
}
+#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);
setup_bus();
- g_atexit (exit_func);
-
return 0;
}