[java-atk-wrapper] make atk-bridge available but do not use

[Magdalen Berns <mberns src gnome org>]

commit ead528835dfeeb57ac1b4167208d6ff5dd6930eb
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sat Nov 15 16:43:48 2014 +0000

    make atk-bridge available but do not use
    
    The up to date way to call atk-bridge is by calling
    atk_bridge_adaptor_init
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=737125

 configure.ac         |    3 ---
 jni/src/AtkWrapper.c |   23 +----------------------
 jni/src/Makefile.am  |    6 ++----
 3 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1258535..959037b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,6 @@ PKG_CHECK_MODULES(JAW, [
   gconf-2.0
 ])
 
-ATK_BRIDGE_LIB_PATH="`pkg-config --variable=libdir gtk+-2.0`/gtk-2.0"
-AC_SUBST(ATK_BRIDGE_LIB_PATH)
-
 case "${target_os}" in
 cygwin*)
   LIB_ATK_WRAPPER_LD_FLAGS="-avoid-version -no-undefined"
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index b856be0..2c65e20 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -171,28 +171,7 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_initNativeLibrary(JNIEnv *jniEnv
     return JNI_FALSE;
   }
 
-  const gchar* gtk_module_path = g_getenv("GTK_PATH");
-  if (!gtk_module_path)
-  {
-    gtk_module_path = ATK_BRIDGE_LIB_PATH;
-  }
-
-  if (jaw_debug) {
-    printf("GTK_PATH=%s\n", gtk_module_path);
-  }
-
-  gtk_module_path = g_strconcat(gtk_module_path, "/modules", NULL);
-  const gchar* atk_bridge_file = g_module_build_path(gtk_module_path, "atk-bridge");
-
-  if (jaw_debug) {
-    printf("We are going to load %s\n", atk_bridge_file);
-  }
-
-  module_atk_bridge = g_module_open(atk_bridge_file, G_MODULE_BIND_LAZY);
-
-  if (!module_atk_bridge) {
-    return JNI_FALSE;
-  }
+  atk_bridge_adaptor_init();
 
   jaw_impl_init_mutex();
 
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 698ac65..c1a2250 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -23,12 +23,10 @@ noinst_HEADERS = jawimpl.h \
                  jawutil.h
 
 libatk_wrapper_la_CFLAGS = $(JNI_INCLUDES)\
-                           $(JAW_CFLAGS)\
-                           -DATK_BRIDGE_LIB_PATH=\"$(ATK_BRIDGE_LIB_PATH)\"
+                           $(JAW_CFLAGS)
 
 libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
-                             $(JAW_CFLAGS)\
-                             -DATK_BRIDGE_LIB_PATH=\"$(ATK_BRIDGE_LIB_PATH)\"
+                             $(JAW_CFLAGS)
 
 libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS) \
                             $(LT_VERSION_INFO) \