[gnome-shell] Always enable a11y

[Bastien Nocera <hadess src gnome org>]

commit de1eafb564b5cbd286188d0e6efe4b7c8ff9d927
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jun 14 12:57:09 2012 +0100

    Always enable a11y
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678095

 configure.ac     |    1 +
 src/Makefile.am  |    2 -
 src/main.c       |   16 +++++-
 src/shell-a11y.c |  164 ------------------------------------------------------
 src/shell-a11y.h |   32 -----------
 5 files changed, 16 insertions(+), 199 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 29354da..eaf7daa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,7 @@ GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libxml-2.0
                                gtk+-3.0 >= $GTK_MIN_VERSION
+                               atk-bridge-2.0
                                folks >= $FOLKS_MIN_VERSION
                                libmutter >= $MUTTER_MIN_VERSION
                                gjs-internals-1.0 >= $GJS_MIN_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 8023794..05c8457 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,8 +153,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-wm-private.h		\
 	gnome-shell-plugin.c		\
 	shell-app.c			\
-	shell-a11y.h			\
-	shell-a11y.c			\
 	shell-app-system.c		\
 	shell-app-usage.c		\
 	shell-contact-system.c	\
diff --git a/src/main.c b/src/main.c
index e398fd1..ad4fb3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,10 +18,10 @@
 #include <meta/main.h>
 #include <meta/meta-plugin.h>
 #include <meta/prefs.h>
+#include <atk-bridge.h>
 #include <telepathy-glib/debug.h>
 #include <telepathy-glib/debug-sender.h>
 
-#include "shell-a11y.h"
 #include "shell-global.h"
 #include "shell-global-private.h"
 #include "shell-js.h"
@@ -236,6 +236,20 @@ shell_perf_log_init (void)
 }
 
 static void
+shell_a11y_init (void)
+{
+  if (clutter_get_accessibility_enabled () == FALSE)
+    {
+      g_warning ("Accessibility: clutter has no accessibility enabled"
+                 " skipping the atk-bridge load");
+    }
+  else
+    {
+      atk_bridge_adaptor_init (NULL, NULL);
+    }
+}
+
+static void
 default_log_handler (const char     *log_domain,
                      GLogLevelFlags  log_level,
                      const char     *message,