iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 04:52:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge CGlobalModule(s) into CModule(s)

Browse Source
This commit is contained in:
Kyle Fuller
2011-08-08 17:22:08 +01:00
parent a4b155995c
commit c456d20b21
23 changed files with 181 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/modpython/module.h
View File

@@ -24,7 +24,7 @@ class CPyModule : public CModule {
VWebSubPages* _GetSubPages();
public:
CPyModule(CUser* pUser, const CString& sModName, const CString& sDataPath,
PyObject* pyObj, CGlobalModule* pModPython)
PyObject* pyObj, CModule* pModPython)
: CModule(NULL, pUser, sModName, sDataPath) {
m_pyObj = pyObj;
Py_INCREF(pyObj);
@@ -114,7 +114,7 @@ static inline CPyModule* AsPyModule(CModule* p) {
return dynamic_cast<CPyModule*>(p);
}
inline CPyModule* CreatePyModule(CUser* pUser, const CString& sModName, const CString& sDataPath, PyObject* pyObj, CGlobalModule* pModPython) {
inline CPyModule* CreatePyModule(CUser* pUser, const CString& sModName, const CString& sDataPath, PyObject* pyObj, CModule* pModPython) {
return new CPyModule(pUser, sModName, sDataPath, pyObj, pModPython);
}

7
modules/modpython/znc.py
View File

@@ -443,7 +443,12 @@ def load_module(modname, args, user, retmsg, modpython):
module.SetDescription(cl.description)
module.SetArgs(args)
module.SetModPath(pymodule.__file__)
user.GetModules().push_back(module._cmod)
if user:
user.GetModules().push_back(module._cmod)
else:
CZNC.Get().GetModules().push_back(module._cmod)
try:
loaded = True
if not module.OnLoad(args, retmsg):