From 5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 21 Sep 2004 11:09:32 +0000 Subject: Fix mozilla API checks to correctly detect firefox libraries. 2004-09-21 Christian Persch * 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. --- embed/mozilla/EphyContentPolicy.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'embed/mozilla/EphyContentPolicy.cpp') 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 */ -- cgit v1.2.3