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/EphyAboutRedirector.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/EphyAboutRedirector.cpp')
| -rw-r--r-- | embed/mozilla/EphyAboutRedirector.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp index a7f9fbffe..3a5f49913 100644 --- a/embed/mozilla/EphyAboutRedirector.cpp +++ b/embed/mozilla/EphyAboutRedirector.cpp @@ -50,10 +50,7 @@ #include <nsIServiceManager.h> #include <nsCOMPtr.h> #include <nsIURI.h> - -#ifdef ALLOW_PRIVATE_STRINGS -#include <nsString.h> -#endif +#include <nsEmbedString.h> static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -75,7 +72,7 @@ NS_IMETHODIMP EphyAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) { NS_ENSURE_ARG(aURI); - nsCAutoString path; + nsEmbedCString path; (void)aURI->GetPath(path); nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID)); @@ -86,7 +83,7 @@ EphyAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) if (strcmp(path.get(), kRedirMap[i].id) == 0) { nsCOMPtr<nsIChannel> tempChannel; - ioService->NewChannel(nsDependentCString(kRedirMap[i].url), + ioService->NewChannel(nsEmbedCString(kRedirMap[i].url), nsnull, nsnull, getter_AddRefs(tempChannel)); NS_ENSURE_TRUE (tempChannel, NS_ERROR_FAILURE); |