#include <stdio.h>
#include <stdarg.h>
#include <string.h>
+#include<sys/stat.h>
#include <atk/atk.h>
#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);
g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message);
return NULL;
}
+ dbus_connection_set_exit_on_disconnect (bus, FALSE);
}
}
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
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;
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
{
DBusMessageIter iter;
DBusError error;
DBusPendingCall *pending;
+ const int max_addr_length = 128; /* should be long enough */
dbus_error_init (&error);
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/", 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;
}
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;
}
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);
}
}
- 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 ();
/* 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);
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 ();
setup_bus();
- g_atexit (exit_func);
-
return 0;
}
return 0;
}
+gchar*
+g_module_check_init (GModule *module)
+{
+ g_module_make_resident (module);
+
+ return NULL;
+}
+
void
gnome_accessibility_module_init (void)
{