From b774b547788b74884b9eb690c548a6016e714023 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@src.gnome.org>
Date: Thu, 3 Jun 2004 18:51:32 +0000
Subject: merge mozilla-embed-strings branch

---
 embed/mozilla/EphyAboutRedirector.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'embed/mozilla/EphyAboutRedirector.cpp')

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);
 
-- 
cgit v1.2.3