diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 8 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 18 |
4 files changed, 27 insertions, 10 deletions
@@ -1,5 +1,14 @@ 2004-08-06 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/EphyBrowser.h: + * embed/mozilla/mozilla-embed.cpp: + + Now that mozilla bug #246392 is fixed, only enable our work-around + for old mozilla versions. + +2004-08-06 Christian Persch <chpe@cvs.gnome.org> + * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_solve_smart_url): Use s/""/NULL/ in g_string_new(). diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 77ceadfb1..c9cb5a4a0 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -414,6 +414,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index) return ContentNav->GotoIndex (index); } +#if !MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RELEASE, 3) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) /* Workaround for broken reload with frames, see mozilla bug * http://bugzilla.mozilla.org/show_bug.cgi?id=246392 */ @@ -451,6 +452,7 @@ nsresult EphyBrowser::Reload (PRUint32 flags) return webNavigation->Reload (reloadFlags); } +#endif nsresult EphyBrowser::SetZoom (float aZoom) { diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index 99a15f002..d3472782d 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -21,6 +21,12 @@ #ifndef EPHY_BROWSER_H #define EPHY_BROWSER_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "mozilla-version.h" + #include "ephy-encodings.h" #include "ephy-embed.h" @@ -106,11 +112,13 @@ public: nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url); nsresult GoToHistoryIndex (PRInt16 index); +#if !MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RELEASE, 3) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) enum { RELOAD_NORMAL = 0 }; enum { RELOAD_FORCE = 1 }; enum { RELOAD_ENCODING_CHANGE = 2 }; nsresult Reload (PRUint32 flags); +#endif nsresult ForceEncoding (const char *encoding); nsresult GetEncoding (nsACString &encoding); 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 } |