aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed.cpp
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-07-13 04:47:21 +0800
committerChristian Persch <chpe@src.gnome.org>2005-07-13 04:47:21 +0800
commit40cd4d7a1f61926cf9e84664491b3236e9084201 (patch)
tree59947423032e111c797b689962d338f8cf2480d7 /embed/mozilla/mozilla-embed.cpp
parentcccabbcbbe25e8496f6e2bdcc77c235fe3eb3857 (diff)
downloadgsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar.gz
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar.bz2
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar.lz
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar.xz
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.tar.zst
gsoc2013-epiphany-40cd4d7a1f61926cf9e84664491b3236e9084201.zip
Remove the reload workaround, since the mozilla bug is fixed on all
2005-07-12 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/mozilla-embed.cpp: Remove the reload workaround, since the mozilla bug is fixed on all supported mozilla version.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
-rw-r--r--embed/mozilla/mozilla-embed.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 1a8e31b55..1029b5c05 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -490,10 +490,7 @@ static void
impl_reload (EphyEmbed *embed,
gboolean force)
{
-#ifdef HAVE_GECKO_1_8
- guint32 mflags;
-
- mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
+ guint32 mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
if (force)
{
@@ -501,15 +498,6 @@ 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 :
- EphyBrowser::RELOAD_NORMAL);
-#endif
}
static void
@@ -705,15 +693,8 @@ impl_set_encoding (EphyEmbed *embed,
if (NS_FAILED (rv)) return;
}
-#ifdef HAVE_GECKO_1_8
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
- */
- mpriv->browser->Reload (EphyBrowser::RELOAD_ENCODING_CHANGE);
-#endif
}
static char *