From e51cc6d0d42224f16ec8465ca89078a4f7e5a3e7 Mon Sep 17 00:00:00 2001 From: "markh%activestate.com" Date: Thu, 10 Jan 2002 02:01:58 +0000 Subject: [PATCH] More ComponentManagerObsolete fixes. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@111776 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/python/xpcom/src/PyGModule.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/extensions/python/xpcom/src/PyGModule.cpp b/mozilla/extensions/python/xpcom/src/PyGModule.cpp index 09df5c90022..0ff13c16ce4 100644 --- a/mozilla/extensions/python/xpcom/src/PyGModule.cpp +++ b/mozilla/extensions/python/xpcom/src/PyGModule.cpp @@ -65,7 +65,7 @@ PyG_nsIModule::GetClassObject(nsIComponentManager *aCompMgr, NS_PRECONDITION(r_classObj, "null pointer"); *r_classObj = nsnull; CEnterLeavePython _celp; - PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManager)); + PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManagerObsolete)); PyObject *iid = Py_nsIID::PyObjectFromIID(aIID); PyObject *clsid = Py_nsIID::PyObjectFromIID(aClass); const char *methodName = "getClassObject"; @@ -95,7 +95,7 @@ PyG_nsIModule::RegisterSelf(nsIComponentManager *aCompMgr, NS_PRECONDITION(aCompMgr, "null pointer"); NS_PRECONDITION(aPath, "null pointer"); CEnterLeavePython _celp; - PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManager)); + PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManagerObsolete)); PyObject *path = MakeInterfaceParam(aPath, &NS_GET_IID(nsIFile)); const char *methodName = "registerSelf"; nsresult nr = InvokeNativeViaPolicy(methodName, NULL, "OOzz", cm, path, registryLocation, componentType); @@ -112,7 +112,7 @@ PyG_nsIModule::UnregisterSelf(nsIComponentManager* aCompMgr, NS_PRECONDITION(aCompMgr, "null pointer"); NS_PRECONDITION(aPath, "null pointer"); CEnterLeavePython _celp; - PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManager)); + PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManagerObsolete)); PyObject *path = MakeInterfaceParam(aPath, &NS_GET_IID(nsIFile)); const char *methodName = "unregisterSelf"; nsresult nr = InvokeNativeViaPolicy(methodName, NULL, "OOz", cm, path, registryLocation); @@ -127,7 +127,7 @@ PyG_nsIModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload) NS_PRECONDITION(aCompMgr, "null pointer"); NS_PRECONDITION(okToUnload, "null pointer"); CEnterLeavePython _celp; - PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManager)); + PyObject *cm = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManagerObsolete)); const char *methodName = "canUnload"; PyObject *ret = NULL; nsresult nr = InvokeNativeViaPolicy(methodName, &ret, "O", cm); @@ -183,7 +183,7 @@ NS_IMETHODIMP PyG_nsIComponentLoader::Init(nsIComponentManager *aCompMgr, nsISup { CEnterLeavePython _celp; const char *methodName = "init"; - PyObject *c = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManager)); + PyObject *c = MakeInterfaceParam(aCompMgr, &NS_GET_IID(nsIComponentManagerObsolete)); PyObject *r = MakeInterfaceParam(aRegistry, &NS_GET_IID(nsISupports)); nsresult nr = InvokeNativeViaPolicy(methodName, NULL, "OO", c, r); Py_XDECREF(c);