diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
| commit | b774b547788b74884b9eb690c548a6016e714023 (patch) | |
| tree | 72b9df09c0fc257169b3e9b9cbdc349e56a63101 /embed/mozilla/EphyContentPolicy.cpp | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.bz2 gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.lz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.xz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'embed/mozilla/EphyContentPolicy.cpp')
| -rw-r--r-- | embed/mozilla/EphyContentPolicy.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index 31d4610bf..b4dbfe632 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -25,15 +25,14 @@ #include "EphyContentPolicy.h" +#include "mozilla-version.h" + #include "eel-gconf-extensions.h" #include "ephy-debug.h" #include <nsCOMPtr.h> #include <nsIURI.h> - -#ifdef ALLOW_PRIVATE_STRINGS -#include <nsString.h> -#endif +#include <nsEmbedString.h> #define CONF_LOCKDOWN_DISABLE_UNSAFE_PROTOCOLS "/apps/epiphany/lockdown/disable_unsafe_protocols" #define CONF_LOCKDOWN_ADDITIONAL_SAFE_PROTOCOLS "/apps/epiphany/lockdown/additional_safe_protocols" @@ -60,7 +59,7 @@ EphyContentPolicy::~EphyContentPolicy() g_slist_free (mSafeProtocols); } -#if MOZILLA_SNAPSHOT >= 18 +#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) NS_IMETHODIMP EphyContentPolicy::ShouldLoad(PRUint32 aContentType, nsIURI *aContentLocation, @@ -78,10 +77,10 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType, NS_ENSURE_TRUE (aContentLocation, NS_ERROR_FAILURE); - nsCAutoString scheme; + nsEmbedCString scheme; aContentLocation->GetScheme (scheme); - nsCAutoString spec; + nsEmbedCString spec; aContentLocation->GetSpec (spec); LOG ("ShouldLoad type=%d location=%s (scheme %s)", aContentType, spec.get(), scheme.get()) @@ -90,7 +89,7 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType, /* Allow the load if the protocol is in safe list, or it's about:blank */ if (g_slist_find_custom (mSafeProtocols, scheme.get(), (GCompareFunc) strcmp) - || spec.Equals ("about:blank")) + || strcmp (spec.get(), "about:blank") == 0) { *aDecision = nsIContentPolicy::ACCEPT; } @@ -128,17 +127,17 @@ NS_IMETHODIMP EphyContentPolicy::ShouldLoad(PRInt32 contentType, return NS_OK; } - nsCAutoString scheme; + nsEmbedCString scheme; contentLocation->GetScheme (scheme); - nsCAutoString spec; + nsEmbedCString spec; contentLocation->GetSpec (spec); *_retval = PR_FALSE; /* Allow the load if the protocol is in safe list, or it's about:blank */ if (g_slist_find_custom (mSafeProtocols, scheme.get(), (GCompareFunc) strcmp) - || spec.Equals ("about:blank")) + || strcmp (spec.get(), "about:blank") == 0) { *_retval = PR_TRUE; } @@ -159,4 +158,5 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType, *_retval = PR_TRUE; return NS_OK; } -#endif /* MOZILLA_SNAPSHOT >= 18 */ +#endif /* MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) */ + |