From e191ed4bdab2c9d6aad33563edd1119e280c810c Mon Sep 17 00:00:00 2001 From: "mhammond%skippinet.com.au" Date: Wed, 22 May 2002 05:41:04 +0000 Subject: [PATCH] nsCString->nsString API changes. Merged from 1.0 branch. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@122011 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/python/xpcom/src/loader/pyloader.cpp | 13 +++++++------ mozilla/extensions/python/xpcom/src/xpcom.cpp | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp b/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp index 0c7453b070d..4e223e0b2f5 100644 --- a/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp +++ b/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp @@ -31,6 +31,7 @@ #include "nsIModule.h" #include "nsDirectoryServiceDefs.h" #include "nsILocalFile.h" +#include "nsString.h" #include "nsXPIDLString.h" #include "nsString.h" #include "stdlib.h" @@ -81,17 +82,17 @@ void AddStandardPaths() LogError("The Python XPCOM loader could not locate the 'bin' directory\n"); return; } - nsCAutoString python(NS_LITERAL_CSTRING("python")); - aFile->Append(python); - nsCAutoString path_string; - aFile->GetPath(path_string); + aFile->Append(NS_LITERAL_STRING("python")); + nsAutoString pathBuf; + aFile->GetPath(pathBuf); PyObject *obPath = PySys_GetObject("path"); if (!obPath) { LogError("The Python XPCOM loader could not get the Python sys.path variable\n"); return; } - LogDebug("The Python XPCOM loader is adding '%s' to sys.path\n", (const char *)path_string.get()); - PyObject *newStr = PyString_FromString(path_string.get()); + NS_LossyConvertUCS2toASCII pathCBuf(pathBuf); + LogDebug("The Python XPCOM loader is adding '%s' to sys.path\n", pathCBuf.get()); + PyObject *newStr = PyString_FromString(pathCBuf.get()); PyList_Insert(obPath, 0, newStr); Py_XDECREF(newStr); } diff --git a/mozilla/extensions/python/xpcom/src/xpcom.cpp b/mozilla/extensions/python/xpcom/src/xpcom.cpp index bae69570c9a..48f9143d8af 100644 --- a/mozilla/extensions/python/xpcom/src/xpcom.cpp +++ b/mozilla/extensions/python/xpcom/src/xpcom.cpp @@ -503,8 +503,8 @@ PRBool PyXPCOM_Globals_Ensure() if (end > landmark) *end = '\0'; nsCOMPtr ns_bin_dir; - nsCAutoString ns_landmark(landmark); - NS_NewLocalFile(ns_landmark, PR_FALSE, getter_AddRefs(ns_bin_dir)); + NS_ConvertASCIItoUCS2 strLandmark(landmark); + NS_NewLocalFile(strLandmark, PR_FALSE, getter_AddRefs(ns_bin_dir)); nsresult rv = NS_InitXPCOM2(nsnull, ns_bin_dir, nsnull); #else // Elsewhere, Mozilla can find it itself (we hope!)