diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-08-06 23:31:18 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-08-06 23:31:18 +0800 |
| commit | ace0653216f5e6e4d8f4f972cc96a0f27f147cf8 (patch) | |
| tree | b92807f76fbfa3b3ee1fda9d8052f8e062807274 /embed/mozilla/mozilla-embed.cpp | |
| parent | 54f1919cae74d3551c23eef9d00975344d1c78a9 (diff) | |
| download | gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar.gz gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar.bz2 gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar.lz gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar.xz gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.tar.zst gsoc2013-epiphany-ace0653216f5e6e4d8f4f972cc96a0f27f147cf8.zip | |
Fix the reload workaround version checks to look for the correct versions.
2004-08-06 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-version.h:
Fix the reload workaround version checks to look for the
correct versions. Thanks to Crispin for noticing this.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 47721ab13..4a9c0b0f0 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -502,7 +502,7 @@ static void impl_reload (EphyEmbed *embed, gboolean force) { -#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RELEASE, 3) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) +#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) guint32 mflags; mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL; @@ -710,7 +710,7 @@ 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) +#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) gtk_moz_embed_reload (GTK_MOZ_EMBED (embed), GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE); #else |