diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-08-06 20:51:09 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-08-06 20:51:09 +0800 |
| commit | f15105e06c66e1156f6c8f4542db62eed0ee46f2 (patch) | |
| tree | c157b80dee44f21df8a8da49b496864151ae1cd4 /embed/mozilla/EphyBrowser.h | |
| parent | f9f94be91053ec7560e4b6e34a338dda9a40457d (diff) | |
| download | gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar.gz gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar.bz2 gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar.lz gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar.xz gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.tar.zst gsoc2013-epiphany-f15105e06c66e1156f6c8f4542db62eed0ee46f2.zip | |
Now that mozilla bug #246392 is fixed, only enable our work-around for old
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.
Diffstat (limited to 'embed/mozilla/EphyBrowser.h')
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 8 |
1 files changed, 8 insertions, 0 deletions
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); |