aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François Rameau <jframeau@cvs.gnome.org>2006-10-25 05:17:56 +0800
committerJean-François Rameau <jframeau@src.gnome.org>2006-10-25 05:17:56 +0800
commitd5fa026bd8148ce8c54c5dc20ea96dfd3d427315 (patch)
tree9e993e9fb2f36721801b5479bd5b155247bb40b4
parentf2d423a34e23b3d785fab96c9c14925bdbe16591 (diff)
downloadgsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar.gz
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar.bz2
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar.lz
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar.xz
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.tar.zst
gsoc2013-epiphany-d5fa026bd8148ce8c54c5dc20ea96dfd3d427315.zip
Fix previous commit for gecko 1.8.0.x.
2006-10-24 Jean-François Rameau <jframeau@cvs.gnome.org> * embed/mozilla/mozilla-embed.cpp: (impl_load): Fix previous commit for gecko 1.8.0.x.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/mozilla-embed.cpp3
2 files changed, 8 insertions, 1 deletions
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 <jframeau@cvs.gnome.org>
+
+ * embed/mozilla/mozilla-embed.cpp: (impl_load):
+
+ Fix previous commit for gecko 1.8.0.x.
+
2006-10-22 Jean-François Rameau <jframeau@cvs.gnome.org>
* 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);
}