2007-03-29 Francis Kung <fkung@redhat.com>

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
	(Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit): Revert last patch.

2 files changed, 5 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index bbbd5380f..fffa84438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29  Francis Kung  <fkung@redhat.com>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+	(Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit): Revert last patch.
+
 2007-03-29  Mark Wielaard  <mark@klomp.org>
 
 	* native/jni/java-nio/Makefile.am (LIBADD): Add libclasspathnative.
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
index 5ed18f1e9..b174ad128 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
@@ -161,40 +161,6 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env,
   argv[0][0] = '\0';
   argv[1] = NULL;
   
-  /* Due to a bug in GNOME accessibility, we force accessibility off by
-   * stripping "gail" and "atk-bridge" out of the gnome modules list.
-   * See http://bugzilla.gnome.org/show_bug.cgi?id=423057
-   */
-  char* gtk_env_modules = getenv("GTK_MODULES");
-  
-  if (gtk_env_modules != NULL && strlen(gtk_env_modules) != 0)
-    {
-      if (!strcmp(gtk_env_modules, "gail:atk-bridge"))
-        unsetenv("GTK_MODULES");
-    
-      else if (gtk_env_modules != NULL)
-        {
-          char* token = strtok(gtk_env_modules, ":");
-          int len = strlen(gtk_env_modules); 
-          char* modules = (char*)g_malloc (sizeof(char*) * len);
-          modules[0] = '\0';
-          while (token != NULL)
-            {
-              if (strcmp(token, "gail") != 0 &&
-                  strcmp(token, "atk-bridge") != 0)
-                {
-                  if (modules[0] != '\0')
-                    strcat(modules, ":");
-                  strcat(modules, token);
-                }
-              token = strtok(NULL, ":");
-            }
-
-          setenv("GTK_MODULES", modules, 1);
-          g_free (modules);
-        }
-    }
-
   init_glib_threads(env, portableNativeSync);
 
   /* From GDK 2.0 onwards we have to explicitly call gdk_threads_init */