diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | embed/mozilla/EphyContentPolicy.cpp | 4 |
3 files changed, 14 insertions, 5 deletions
@@ -1,6 +1,13 @@ 2004-09-21 Christian Persch <chpe@cvs.gnome.org> * configure.ac: + * embed/mozilla/EphyContentPolicy.cpp: + + Simplified nsIContentPolicy API check. + +2004-09-21 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EphyBrowser.cpp: diff --git a/configure.ac b/configure.ac index fc827714e..fc7f60a34 100644 --- a/configure.ac +++ b/configure.ac @@ -253,10 +253,12 @@ AC_COMPILE_IFELSE( nsISupports *arg4; p->ShouldLoad(0,nsnull,nsnull,arg4,nsEmbedCString(),nsnull,nsnull);]] )], - [AC_DEFINE([MOZ_NSICONTENTPOLICY_VARIANT_2],[1],[dummy]) result=2], - [AC_DEFINE([MOZ_NSICONTENTPOLICY_VARIANT_1],[1],[dummy]) result=1]) + [variant=2], + [variant=1]) -AC_MSG_RESULT([variant $result]) +AC_DEFINE_UNQUOTED([MOZ_NSICONTENTPOLICY_VARIANT], [$variant], [Define the nsIContentPolicy API variant]) + +AC_MSG_RESULT([variant $variant]) dnl Changed from char* to nsIURI* in 1.7.4 on 1.7 branch, dnl in 1.8a3 on trunk and on aviary branch diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index 65b26b05b..54a0511a5 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -59,7 +59,7 @@ EphyContentPolicy::~EphyContentPolicy() g_slist_free (mSafeProtocols); } -#ifdef MOZ_NSICONTENTPOLICY_VARIANT_2 +#ifdef MOZ_NSICONTENTPOLICY_VARIANT == 2 NS_IMETHODIMP EphyContentPolicy::ShouldLoad(PRUint32 aContentType, nsIURI *aContentLocation, @@ -158,4 +158,4 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType, *_retval = PR_TRUE; return NS_OK; } -#endif /* MOZ_NSICONTENTPOLICY_VARIANT_2 || MOZ_NSICONTENTPOLICY_VARIANT_3 */ +#endif /* MOZ_NSICONTENTPOLICY_VARIANT == 2 */ |