diff options
Diffstat (limited to 'plugins/pychrysa/gui/module.c')
-rw-r--r-- | plugins/pychrysa/gui/module.c | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/plugins/pychrysa/gui/module.c b/plugins/pychrysa/gui/module.c index 605877f..0c5403e 100644 --- a/plugins/pychrysa/gui/module.c +++ b/plugins/pychrysa/gui/module.c @@ -25,6 +25,10 @@ #include "module.h" +#include <assert.h> + + + #include "editem.h" #include "panels/module.h" @@ -44,27 +48,46 @@ bool add_gui_module_to_python_module(PyObject *super) { - bool result; - PyObject *module; + bool result; /* Bilan à retourner */ + PyObject *module; /* Sous-module mis en place */ int ret; /* Bilan d'un appel */ - static PyMethodDef py_gui_methods[] = { - { NULL } + static PyModuleDef py_chrysalide_gui_module = { + + .m_base = PyModuleDef_HEAD_INIT, + + .m_name = "pychrysalide.gui", + .m_doc = "Python module for the Chrysalide GUI", + + .m_size = -1, + }; - module = Py_InitModule("pychrysalide.gui", py_gui_methods); + result = false; + + module = PyModule_Create(&py_chrysalide_gui_module); if (module == NULL) return false; - Py_INCREF(module); - ret = PyModule_AddObject(super, "pychrysalide.gui", module); + ret = PyState_AddModule(super, &py_chrysalide_gui_module); + if (ret != 0) goto loading_failed; - result = (ret == 0); + ret = _PyImport_FixupBuiltin(module, "pychrysalide.gui"); + if (ret != 0) goto loading_failed; + + Py_INCREF(module); + ret = PyModule_AddObject(super, "gui", module); + if (ret != 0) goto loading_failed; - if (ret != 0) /* ... */; + result = true; result &= register_python_editor_item(module); + result &= add_gui_panels_module_to_python_module(module); - return true; + loading_failed: + + assert(result); + + return result; } |