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/EphyContentPolicy.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/EphyContentPolicy.cpp')
| -rw-r--r-- | embed/mozilla/EphyContentPolicy.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index 8654afe38..65b26b05b 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -27,8 +27,6 @@ #include "EphyContentPolicy.h" -#include "mozilla-version.h" - #include "eel-gconf-extensions.h" #include "ephy-debug.h" @@ -61,16 +59,12 @@ EphyContentPolicy::~EphyContentPolicy() g_slist_free (mSafeProtocols); } -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) +#ifdef MOZ_NSICONTENTPOLICY_VARIANT_2 NS_IMETHODIMP EphyContentPolicy::ShouldLoad(PRUint32 aContentType, nsIURI *aContentLocation, nsIURI *aRequestingLocation, -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) nsISupports *aContext, -#else - nsIDOMNode *aRequestingNode, -#endif const nsACString &aMimeTypeGuess, nsISupports *aExtra, PRInt16 *aDecision) @@ -109,11 +103,7 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRUint32 aContentType, nsIURI *aContentLocation, nsIURI *aRequestingLocation, -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) nsISupports *aContext, -#else - nsIDOMNode *aRequestingNode, -#endif const nsACString &aMimeType, nsISupports *aExtra, PRInt16 *aDecision) @@ -168,4 +158,4 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType, *_retval = PR_TRUE; return NS_OK; } -#endif /* MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) */ +#endif /* MOZ_NSICONTENTPOLICY_VARIANT_2 || MOZ_NSICONTENTPOLICY_VARIANT_3 */ |