[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:
@@ -310,10 +310,18 @@ static PyObject *PyAddScriptEventListener(PyObject *self, PyObject *args)
|
||||
receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager));
|
||||
if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom(do_GetAtom(nsDependentCString(name)));
|
||||
if (!atom) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
// avoid do_GetAtom - its not part of the XPCOM glue.
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIAtomService> atomService =
|
||||
do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom;
|
||||
rv = atomService->GetAtomUTF8(name, getter_AddRefs(atom));
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
rv = manager->AddScriptEventListener(target, atom, body, lang, defer,
|
||||
untrusted);
|
||||
@@ -373,10 +381,17 @@ static PyObject *PyRegisterScriptEventListener(PyObject *self, PyObject *args)
|
||||
receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager));
|
||||
if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom(do_GetAtom(nsDependentCString(name)));
|
||||
if (!atom) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIAtomService> atomService =
|
||||
do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom;
|
||||
rv = atomService->GetAtomUTF8(name, getter_AddRefs(atom));
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
rv = manager->RegisterScriptEventListener(scriptContext, obScope,
|
||||
target, atom);
|
||||
@@ -437,10 +452,17 @@ static PyObject *PyCompileScriptEventListener(PyObject *self, PyObject *args)
|
||||
receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager));
|
||||
if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom(do_GetAtom(nsDependentCString(name)));
|
||||
if (!atom) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIAtomService> atomService =
|
||||
do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
nsCOMPtr<nsIAtom> atom;
|
||||
rv = atomService->GetAtomUTF8(name, getter_AddRefs(atom));
|
||||
if (NS_FAILED(rv))
|
||||
return PyXPCOM_BuildPyException(rv);
|
||||
|
||||
PRBool didCompile;
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
rv = manager->CompileScriptEventListener(scriptContext, obScope,
|
||||
|
||||
Reference in New Issue
Block a user