[Backport to 1.9]

* GeckoHtmlRender.cs: Set gecko's CompPath property to the launcher-detected MOZILLA_HOME env var so that gecko uses the runtime path as the basis for loading components (#341815) * monodoc.in: reactivate the gecko engine 2008-03-10 Andreia Gaita <avidigal@novell.com> svn path=/branches/mono-1-9/mono-tools/; revision=97897
mono · Mar 10, 2008 · 9189012 · 9189012
1 parent bd01b0e
commit 9189012
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-10  Andreia Gaita  <avidigal@novell.com>
+	[Backport to 1.9]
+	* GeckoHtmlRender.cs: Set gecko's CompPath property to the launcher-detected
+	MOZILLA_HOME env var so that gecko uses the runtime path as the basis for 
+	loading	components (#341815)
+	* monodoc.in: reactivate the gecko engine
+
 2008-01-16  Wade Berrier  <wberrier@novell.com>
 
 	* monodoc.desktop.in: no extension on icon, remove

diff --git a/docbrowser/GeckoHtmlRender.cs b/docbrowser/GeckoHtmlRender.cs
@@ -40,6 +40,11 @@ public GeckoHtmlRender (RootTree help_tree)
 	{
 		this.help_tree = help_tree;
 		tmpPath = Path.Combine (Path.GetTempPath(), "monodoc");
+
+		string mozHome = System.Environment.GetEnvironmentVariable ("MOZILLA_HOME");
+		if (mozHome != null)
+			WebControl.CompPath = mozHome;
+
 		html_panel = new WebControl (tmpPath, "MonodocGecko"); 
 		html_panel.Show(); //due to Gecko bug
 		html_panel.OpenUri += OnOpenUri;

diff --git a/docbrowser/monodoc.in b/docbrowser/monodoc.in
@@ -98,5 +98,4 @@ export MOZILLA_FIVE_HOME
 export MOZILLA_HOME 
 export LD_LIBRARY_PATH
 
-# force '--no-gecko' because xulrunner is crashing on some browsers (bug #341815)
+exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST
-exec @RUNTIME@ $monodocdir/browser.exe --no-gecko $OPTIONS "$@" $REST