diff options
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 8f86a7a33..47721ab13 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -502,12 +502,7 @@ static void impl_reload (EphyEmbed *embed, gboolean force) { - /* Workaround for broken reload with frames, see mozilla bug - * http://bugzilla.mozilla.org/show_bug.cgi?id=246392 - * Replace #if 0 with appropriate MOZILLA_CHECK_VERSION4 once the bug - * has been fixed - */ -#if 0 +#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RELEASE, 3) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) guint32 mflags; mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL; @@ -519,6 +514,9 @@ impl_reload (EphyEmbed *embed, gtk_moz_embed_reload (GTK_MOZ_EMBED(embed), mflags); #else + /* Workaround for broken reload with frames, see mozilla bug + * http://bugzilla.mozilla.org/show_bug.cgi?id=246392 + */ MozillaEmbedPrivate *mpriv = MOZILLA_EMBED (embed)->priv; mpriv->browser->Reload (force ? EphyBrowser::RELOAD_FORCE : @@ -712,15 +710,15 @@ impl_set_encoding (EphyEmbed *embed, if (NS_FAILED (result)) return; } +#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RELEASE, 3) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) + gtk_moz_embed_reload (GTK_MOZ_EMBED (embed), + GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE); +#else /* Workaround for broken reload with frames, see mozilla bug * http://bugzilla.mozilla.org/show_bug.cgi?id=246392 * Replace #if 0 with appropriate MOZILLA_CHECK_VERSION4 once the bug * has been fixed */ -#if 0 - gtk_moz_embed_reload (GTK_MOZ_EMBED (embed), - GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE); -#else mpriv->browser->Reload (EphyBrowser::RELOAD_ENCODING_CHANGE); #endif } |