[Bug 348426] Python extensions fail to build with libxul

r=benjamin@smedbergs.us, sr=jst


git-svn-id: svn://10.0.0.236/trunk@213164 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2006-10-05 10:44:03 +00:00
parent 975a3fb3e5
commit d410bbfc5a
13 changed files with 90 additions and 62 deletions

View File

@@ -42,8 +42,9 @@
#include "nsIArray.h"
#include "nsIAtom.h"
#include "prtime.h"
#include "nsString.h"
#include "nsStringAPI.h"
#include "nsGUIEvent.h"
#include "nsServiceManagerUtils.h"
#include "nsDOMScriptObjectHolder.h"
#include "nsIDOMDocument.h"
@@ -139,7 +140,7 @@ nsresult nsPythonContext::HandlePythonError()
return NS_OK;
nsScriptErrorEvent errorevent(PR_TRUE, NS_LOAD_ERROR);
nsAutoString strFilename;
nsString strFilename;
PyObject *exc, *typ, *tb;
PyErr_Fetch(&exc, &typ, &tb);
@@ -161,7 +162,7 @@ nsresult nsPythonContext::HandlePythonError()
if (code) {
PyObject *filename = PyObject_GetAttrString(code, "co_filename");
if (filename && PyString_Check(filename)) {
CopyUTF8toUTF16(PyString_AsString(filename), strFilename);
CopyUTF8toUTF16(nsCString(PyString_AsString(filename)), strFilename);
errorevent.fileName = strFilename.get();
}
Py_XDECREF(filename);