Bug 312092 Accessible hierarchy incomplete/incorrect

r=benjamin sr=neil

build/unix/run-mozilla.sh

@@ -161,12 +161,6 @@ moz_run_program()
 		fi
 	fi
 	##
-	## Reset GTK_MODULES, strip atk-bridge if exists
-	## Mozilla will load libatk-bridge.so later if necessary
-	##
-	GTK_MODULES=`echo $GTK_MODULES | sed -e 's/atk-bridge//g'`
-	export GTK_MODULES
-	##
 	## Run the program
 	##
 	"$prog" ${1+"$@"}

toolkit/xre/nsAppRunner.cpp

@@ -1877,6 +1877,18 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
   InstallUnixSignalHandlers(argv[0]);
 #endif
 
+#ifdef MOZ_ACCESSIBILITY_ATK
+  // Reset GTK_MODULES, strip atk-bridge if exists
+  // Mozilla will load libatk-bridge.so later if necessary
+  const char* gtkModules = getenv("GTK_MODULES");
+  if (gtkModules) {
+    nsCString gtkModulesStr(gtkModules);
+    gtkModulesStr.ReplaceSubstring("atk-bridge", "");
+    char* newGtkModules = strdup(gtkModulesStr.get());
+    setenv("GTK_MODULES", newGtkModules, 1);
+  }
+#endif
+
   // Unbuffer stdout, needed for tinderbox tests.
   setbuf(stdout, 0);
 

xpfe/bootstrap/nsAppRunner.cpp

@@ -1566,6 +1566,18 @@ int main(int argc, char* argv[])
   InstallUnixSignalHandlers(argv[0]);
 #endif
 
+#ifdef MOZ_ACCESSIBILITY_ATK
+  // Reset GTK_MODULES, strip atk-bridge if exists
+  // Mozilla will load libatk-bridge.so later if necessary
+  const char* gtkModules = getenv("GTK_MODULES");
+  if (gtkModules) {
+    nsCString gtkModulesStr(gtkModules);
+    gtkModulesStr.ReplaceSubstring("atk-bridge", "");
+    char* newGtkModules = strdup(gtkModulesStr.get());
+    setenv("GTK_MODULES", newGtkModules, 1);
+  }
+#endif
+
 #if defined(XP_OS2)
   __pargc = &argc;
   __argv = argv;