diff options
author | Mike Gorse <mgorse@novell.com> | 2009-10-30 15:10:30 -0400 |
---|---|---|
committer | Mike Gorse <mgorse@novell.com> | 2009-10-30 15:10:30 -0400 |
commit | df3d02b1fa397957dee7fee9411196c725bdc4c8 (patch) | |
tree | 8a2f3e705692f8e6c1828c88606f3b3c47e106fd | |
parent | 8ff1bd582c6219eb29814e6d61471c06997cd3fb (diff) | |
download | at-spi2-atk-df3d02b1fa397957dee7fee9411196c725bdc4c8.tar.gz |
Merge.
-rw-r--r-- | atk-adaptor/bridge.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 361d52b..efde9d1 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -291,7 +291,7 @@ adaptor_init (gint *argc, gchar **argv[]) accpath = droute_add_many (atk_adaptor_app_data->droute, "/org/freedesktop/atspi/accessible", NULL, - (DRouteGetDatumFunction) atk_dbus_path_to_object); + (DRouteGetDatumFunction) atk_dbus_path_to_gobject); /* Register all interfaces with droute and set up application accessible db */ spi_initialize_tree (treepath); @@ -336,6 +336,29 @@ gtk_module_init (gint *argc, gchar **argv[]) { return adaptor_init (argc, argv); } + return 0; +} + +void +gnome_accessibility_module_init (void) +{ + const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + + if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) + { + adaptor_init (NULL, NULL); + + if (g_getenv ("AT_SPI_DEBUG")) + { + g_print("Atk Accessibility bridge initialized\n"); + } + } } +void +gnome_accessibility_module_shutdown (void) +{ + spi_atk_deregister_event_listeners (); + exit_func (); +} /*END------------------------------------------------------------------------*/ |