Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some changes for nsIFile moving to nsACString.

Browse Source 
Not part of the build.


git-svn-id: svn://10.0.0.236/trunk@120533 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2002-05-02 11:04:37 +00:00
parent 65c600ce5a
commit be746a0b08
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/extensions/python/xpcom/src/loader/pyloader.cpp
View File

@@ -13,7 +13,7 @@
* Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
* ActiveState Tool Corp. All Rights Reserved.
*
* Contributor(s): Mark Hammond <MarkH@ActiveState.com> (original author)
* Contributor(s): Mark Hammond <mhammond@skippinet.com.au> (original author)
*
*/
@@ -32,7 +32,10 @@
#include "nsDirectoryServiceDefs.h"
#include "nsILocalFile.h"
#include "nsXPIDLString.h"
#include "nsString.h"
#include "stdlib.h"
#include "stdarg.h"
#include <nsFileStream.h> // For console logging.
#ifdef HAVE_LONG_LONG
@@ -95,17 +98,18 @@ void AddStandardPaths()
LogError("The Python XPCOM loader could not locate the 'bin' directory\n");
return;
}
aFile->Append("python");
nsXPIDLCString pathBuf;
aFile->GetPath(getter_Copies(pathBuf));
nsCAutoString python(NS_LITERAL_CSTRING("python"));
aFile->Append(python);
nsCAutoString path_string;
aFile->GetPath(path_string);
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 *)pathBuf);
LogDebug("The Python XPCOM loader is adding '%s' to sys.path\n", (const char *)path_string.get());
// DebugBreak();
PyObject *newStr = PyString_FromString(pathBuf);
PyObject *newStr = PyString_FromString(path_string.get());
PyList_Insert(obPath, 0, newStr);
Py_XDECREF(newStr);
}