From d5fa026bd8148ce8c54c5dc20ea96dfd3d427315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= Date: Tue, 24 Oct 2006 21:17:56 +0000 Subject: Fix previous commit for gecko 1.8.0.x. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-10-24 Jean-François Rameau * embed/mozilla/mozilla-embed.cpp: (impl_load): Fix previous commit for gecko 1.8.0.x. --- ChangeLog | 6 ++++++ embed/mozilla/mozilla-embed.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a71f41aa1..dac2793ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-24 Jean-François Rameau + + * embed/mozilla/mozilla-embed.cpp: (impl_load): + + Fix previous commit for gecko 1.8.0.x. + 2006-10-22 Jean-François Rameau * embed/ephy-embed.h: diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 45213598e..f9ecb1797 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -341,7 +341,6 @@ impl_load (EphyEmbed *embed, if (preview_embed != NULL) { EphyBrowser *pbrowser; - nsresult rv; pbrowser = MOZILLA_EMBED(preview_embed)->priv->browser; if (pbrowser != NULL) @@ -350,11 +349,13 @@ impl_load (EphyEmbed *embed, } } +#ifdef HAVE_GECKO_1_8_1 if (flags & EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) { browser->LoadURI (url, nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP, uri); } else +#endif /* HAVE_GECKO_1_8_1 */ { browser->LoadURI (url, nsIWebNavigation::LOAD_FLAGS_NONE, uri); } -- cgit v1.2.3