#include <atk/atk.h>
#include <droute/droute.h>
+#include <gmodule.h>
#include "bridge.h"
#include "event.h"
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);
}
/* make sure the directory exists */
mkdir("/tmp/at-spi2/", S_IRWXU);
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());
+#endif
return TRUE;
}
static int
setup_bus (void)
{
+#ifndef DISABLE_P2P
DBusServer *server;
DBusError err;
dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL);
spi_global_app_data->server = server;
+#endif
return 0;
}
}
}
+#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;
}
return 0;
}
+gchar*
+g_module_check_init (GModule *module)
+{
+ g_module_make_resident (module);
+
+ return NULL;
+}
+
void
gnome_accessibility_module_init (void)
{