Rely on GObject-introspection implementation for some registrations.

2 files changed, 11 insertions, 4 deletions

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;