diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index f0147ed33..85a0a9f8c 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -806,7 +806,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index) return ContentNav->GotoIndex (index); } -#ifdef GTKMOZEMBED_BROKEN_RELOAD +#ifndef HAVE_GECKO_1_8 /* Workaround for broken reload with frames, see mozilla bug * http://bugzilla.mozilla.org/show_bug.cgi?id=246392 */ @@ -844,7 +844,7 @@ nsresult EphyBrowser::Reload (ReloadType flags) return webNavigation->Reload (reloadFlags); } -#endif +#endif /* !HAVE_GECKO_1_8 */ nsresult EphyBrowser::SetZoom (float aZoom) { diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index 195d26f64..31c2699e1 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -153,7 +153,7 @@ public: nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url); nsresult GoToHistoryIndex (PRInt16 index); -#ifdef GTKMOZEMBED_BROKEN_RELOAD +#ifndef HAVE_GECKO_1_8 enum ReloadType { RELOAD_NORMAL = 0, RELOAD_FORCE = 1, RELOAD_ENCODING_CHANGE = 2 }; diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 6afcdf82d..109f7ea76 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -509,7 +509,7 @@ static void impl_reload (EphyEmbed *embed, gboolean force) { -#ifndef GTKMOZEMBED_BROKEN_RELOAD +#ifdef HAVE_GECKO_1_8 guint32 mflags; mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL; @@ -724,7 +724,7 @@ impl_set_encoding (EphyEmbed *embed, if (NS_FAILED (rv)) return; } -#ifndef GTKMOZEMBED_BROKEN_RELOAD +#ifdef HAVE_GECKO_1_8 gtk_moz_embed_reload (GTK_MOZ_EMBED (embed), GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE); #else |