diff options
| author | Andreia Gaita <avidigal@novell.com> | 2008-03-10 22:36:38 +0300 |
|---|---|---|
| committer | Andreia Gaita <avidigal@novell.com> | 2008-03-10 22:36:38 +0300 |
| commit | 9189012ea5a77a25425442f8902a3b7bb5072033 (patch) | |
| tree | 72c447d50f73d40859597616ad66793cbbef39a6 | |
| parent | bd01b0eae944e78f0216822c3c34b18ec5f15751 (diff) | |
* 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
| -rw-r--r-- | docbrowser/ChangeLog | 7 | ||||
| -rw-r--r-- | docbrowser/GeckoHtmlRender.cs | 5 | ||||
| -rw-r--r-- | docbrowser/monodoc.in | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index 67ad2388..aaac21a5 100644 --- 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 index 175357b8..c785b255 100644 --- a/docbrowser/GeckoHtmlRender.cs +++ b/docbrowser/GeckoHtmlRender.cs @@ -40,6 +40,11 @@ public class GeckoHtmlRender : IHtmlRender { { 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 index 1c755f52..56197de3 100644 --- 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 --no-gecko $OPTIONS "$@" $REST +exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST |