diff options
Diffstat (limited to 'plugins/pe/python')
| -rw-r--r-- | plugins/pe/python/Makefile.am | 20 | ||||
| -rw-r--r-- | plugins/pe/python/format.c | 7 | ||||
| -rw-r--r-- | plugins/pe/python/routine.c | 8 |
3 files changed, 18 insertions, 17 deletions
diff --git a/plugins/pe/python/Makefile.am b/plugins/pe/python/Makefile.am index 18634a3..5949821 100644 --- a/plugins/pe/python/Makefile.am +++ b/plugins/pe/python/Makefile.am @@ -1,23 +1,17 @@ noinst_LTLIBRARIES = libpepython.la -libpepython_la_SOURCES = \ - constants.h constants.c \ - format.h format.c \ - module.h module.c \ - routine.h routine.c \ +libpepython_la_SOURCES = \ + constants.h constants.c \ + format.h format.c \ + module.h module.c \ + routine.h routine.c \ translate.h translate.c - -libpepython_la_LDFLAGS = +libpepython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ + -I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT devdir = $(includedir)/chrysalide/$(subdir) dev_HEADERS = $(libpepython_la_SOURCES:%c=) - - -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ - -I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pe/python/format.c b/plugins/pe/python/format.c index d295da4..4bbb99a 100644 --- a/plugins/pe/python/format.c +++ b/plugins/pe/python/format.c @@ -115,7 +115,7 @@ static PyObject *py_pe_format_new(PyTypeObject *type, PyObject *args, PyObject * if (first_time) { - status = register_class_for_dynamic_pygobject(gtype, type, base); + status = register_class_for_dynamic_pygobject(gtype, type); if (!status) { @@ -539,7 +539,10 @@ bool register_python_pe_format(PyObject *module) dict = PyModule_GetDict(module); - if (!register_class_for_pygobject(dict, G_TYPE_PE_FORMAT, type, get_python_executable_format_type())) + if (!ensure_python_executable_format_is_registered()) + return false; + + if (!register_class_for_pygobject(dict, G_TYPE_PE_FORMAT, type)) return false; if (!define_python_pe_format_constants(type)) diff --git a/plugins/pe/python/routine.c b/plugins/pe/python/routine.c index cebeb2a..fd30e6d 100644 --- a/plugins/pe/python/routine.c +++ b/plugins/pe/python/routine.c @@ -221,7 +221,9 @@ bool register_python_pe_exported_routine(PyObject *module) dict = PyModule_GetDict(module); - if (!register_class_for_pygobject(dict, G_TYPE_PE_EXPORTED_ROUTINE, type, get_python_binary_routine_type())) + /* TODO : ensure get_python_binary_routine_type() */ + + if (!register_class_for_pygobject(dict, G_TYPE_PE_EXPORTED_ROUTINE, type)) return false; if (!define_python_pe_exported_routine_constants(type)) @@ -461,7 +463,9 @@ bool register_python_pe_imported_routine(PyObject *module) dict = PyModule_GetDict(module); - if (!register_class_for_pygobject(dict, G_TYPE_PE_IMPORTED_ROUTINE, type, get_python_pe_exported_routine_type())) + /* TODO : ensure get_python_pe_exported_routine_type() */ + + if (!register_class_for_pygobject(dict, G_TYPE_PE_IMPORTED_ROUTINE, type)) return false; return true; |