#include "accessible-register.h"
#include "adaptors.h"
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
/*
* Provides the path for the introspection directory.
GError *err = NULL;
DBusError error;
DBusConnection *bus;
+ AtkObject *root;
gchar *introspection_directory;
DRoutePath *treepath, *accpath;
+ root = atk_get_root ();
+ g_return_val_if_fail (root, 0);
+
/* Parse command line options */
opt = g_option_context_new(NULL);
g_option_context_add_main_entries(opt, atspi_option_entries, NULL);
/* Allocate global data and do ATK initializations */
atk_adaptor_app_data = g_new0 (SpiAppData, 1);
atk_misc = atk_misc_get_instance ();
- atk_adaptor_app_data->root = atk_get_root();
+ atk_adaptor_app_data->root = root;
/* Set up D-Bus connection and register bus name */
dbus_error_init (&error);
spi_initialize_tree (treepath);
spi_initialize_accessible (accpath);
+ spi_initialize_application (accpath);
spi_initialize_action(accpath);
spi_initialize_collection (accpath);
spi_initialize_component (accpath);
spi_initialize_text (accpath);
spi_initialize_value (accpath);
- /* Register methods to send D-Bus signals on certain ATK events */
- spi_atk_register_event_listeners ();
-
/* Initialize the AtkObject registration */
atk_dbus_initialize (atk_adaptor_app_data->root);
+ /* Register methods to send D-Bus signals on certain ATK events */
+ spi_atk_register_event_listeners ();
+
/* Register this app by sending a signal out to AT-SPI registry daemon */
register_application (atk_adaptor_app_data);