Fix gtk_module_init to always return a value

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index a63539e..b1d4abe 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -39,7 +39,7 @@
 #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.
@@ -238,10 +238,14 @@ adaptor_init (gint *argc, gchar **argv[])
   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);
@@ -252,7 +256,7 @@ adaptor_init (gint *argc, gchar **argv[])
   /* 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);
@@ -293,6 +297,7 @@ adaptor_init (gint *argc, gchar **argv[])
   spi_initialize_tree (treepath);
 
   spi_initialize_accessible (accpath);
+  spi_initialize_application (accpath);
   spi_initialize_action(accpath);
   spi_initialize_collection (accpath);
   spi_initialize_component (accpath);
@@ -306,12 +311,12 @@ adaptor_init (gint *argc, gchar **argv[])
   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);
 
@@ -325,7 +330,13 @@ adaptor_init (gint *argc, gchar **argv[])
 int
 gtk_module_init (gint *argc, gchar **argv[])
 {
-  return adaptor_init (argc, argv);
+  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
+
+  if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
+    {
+       return adaptor_init (argc, argv);
+    }
+  return 0;
 }
 
 /*END------------------------------------------------------------------------*/