diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-21 19:09:32 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-21 19:09:32 +0800 |
| commit | 5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f (patch) | |
| tree | 6fb8fd3d114376d615725f54e73f3da8d51b95ca /embed/mozilla/mozilla-embed.cpp | |
| parent | 695c95a8a47d6d2c1092bd6a379743d3939961bc (diff) | |
| download | gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.gz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.bz2 gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.lz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.xz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.zst gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.zip | |
Fix mozilla API checks to correctly detect firefox libraries.
2004-09-21 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EphyContentPolicy.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
Fix mozilla API checks to correctly detect firefox libraries.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 95e854cf9..7d98478cf 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -503,7 +503,7 @@ static void impl_reload (EphyEmbed *embed, gboolean force) { -#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) +#ifndef GTKMOZEMBED_BROKEN_RELOAD guint32 mflags; mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL; @@ -711,14 +711,12 @@ impl_set_encoding (EphyEmbed *embed, if (NS_FAILED (rv)) return; } -#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) +#ifndef GTKMOZEMBED_BROKEN_RELOAD 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 */ mpriv->browser->Reload (EphyBrowser::RELOAD_ENCODING_CHANGE); #endif |