[at-spi2-atk] Move NO_AT_BRIDGE test to the library
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Move NO_AT_BRIDGE test to the library
- Date: Fri, 15 Jun 2012 16:07:03 +0000 (UTC)
commit 83b4bb97069a9bffc939a6e1d738c8ff1d56e799
Author: Alejandro PiÃeiro <apinheiro igalia com>
Date: Thu Jun 14 21:41:57 2012 +0200
Move NO_AT_BRIDGE test to the library
https://bugzilla.gnome.org/show_bug.cgi?id=678125
atk-adaptor/bridge.c | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index ff5c320..d776a4b 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -699,6 +699,27 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
}
/*
+ * Checks the status of the environment variables
+ *
+ * At this moment it only checks NO_AT_BRIDGE
+ *
+ * Returns TRUE if there isn't anything on the environment preventing
+ * you to load the bridge, FALSE otherwise
+ */
+static gboolean
+check_envvar (void)
+{
+ const gchar *envvar;
+
+ envvar = g_getenv ("NO_AT_BRIDGE");
+
+ if (envvar && atoi (envvar) == 1)
+ return FALSE;
+ else
+ return TRUE;
+}
+
+/*
* spi_app_init
*
* The following needs to be initialized.
@@ -717,8 +738,13 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
DBusError error;
AtkObject *root;
static gboolean inited = FALSE;
+ gboolean load_bridge;
+
+ load_bridge = check_envvar ();
+ if (inited && !load_bridge)
+ g_warning ("ATK Bridge is disabled but a11y has already been enabled.");
- if (inited)
+ if (inited || !load_bridge)
return 0;
inited = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]