10 files changed, 22 insertions, 29 deletions
diff --git a/plugins/pychrysalide/analysis/types/Makefile.am b/plugins/pychrysalide/analysis/types/Makefile.am
index d13fe0c..697c998 100644
--- a/plugins/pychrysalide/analysis/types/Makefile.am
+++ b/plugins/pychrysalide/analysis/types/Makefile.am
@@ -1,30 +1,23 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysistypes.la
 
-libpychrysaanalysistypes_la_SOURCES =	\
-	array.h array.c						\
-	basic.h basic.c						\
-	constants.h constants.c				\
-	cse.h cse.c							\
-	encaps.h encaps.c					\
-	expr.h expr.c						\
-	literal.h literal.c					\
-	module.h module.c					\
-	override.h override.c				\
-	proto.h proto.c						\
+libpychrysaanalysistypes_la_SOURCES =		\
+	array.h array.c							\
+	basic.h basic.c							\
+	constants.h constants.c					\
+	cse.h cse.c								\
+	encaps.h encaps.c						\
+	expr.h expr.c							\
+	literal.h literal.c						\
+	module.h module.c						\
+	override.h override.c					\
+	proto.h proto.c							\
 	template.h template.c
 
-libpychrysaanalysistypes_la_LDFLAGS = 
+libpychrysaanalysistypes_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysistypes_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/analysis/types/array.c b/plugins/pychrysalide/analysis/types/array.c
index 8055316..88b773e 100644
--- a/plugins/pychrysalide/analysis/types/array.c
+++ b/plugins/pychrysalide/analysis/types/array.c
@@ -423,7 +423,7 @@ bool ensure_python_array_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_ARRAY_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_ARRAY_TYPE, type))
             return false;
 
     }
diff --git a/plugins/pychrysalide/analysis/types/basic.c b/plugins/pychrysalide/analysis/types/basic.c
index 9ae4f8f..19fb9d1 100644
--- a/plugins/pychrysalide/analysis/types/basic.c
+++ b/plugins/pychrysalide/analysis/types/basic.c
@@ -210,7 +210,7 @@ bool ensure_python_basic_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_BASIC_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_BASIC_TYPE, type))
             return false;
 
         if (!define_basic_type_constants(type))
diff --git a/plugins/pychrysalide/analysis/types/cse.c b/plugins/pychrysalide/analysis/types/cse.c
index 7701d48..0aab4d9 100644
--- a/plugins/pychrysalide/analysis/types/cse.c
+++ b/plugins/pychrysalide/analysis/types/cse.c
@@ -262,7 +262,7 @@ bool ensure_python_class_enum_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_CLASS_ENUM_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_CLASS_ENUM_TYPE, type))
             return false;
 
         if (!define_class_enum_type_constants(type))
diff --git a/plugins/pychrysalide/analysis/types/encaps.c b/plugins/pychrysalide/analysis/types/encaps.c
index 3a5acb5..bc9f4db 100644
--- a/plugins/pychrysalide/analysis/types/encaps.c
+++ b/plugins/pychrysalide/analysis/types/encaps.c
@@ -223,7 +223,7 @@ bool ensure_python_encapsulated_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_ENCAPSULATED_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_ENCAPSULATED_TYPE, type))
             return false;
 
         if (!define_encapsulated_type_constants(type))
diff --git a/plugins/pychrysalide/analysis/types/expr.c b/plugins/pychrysalide/analysis/types/expr.c
index 02cb02f..e3b2b0a 100644
--- a/plugins/pychrysalide/analysis/types/expr.c
+++ b/plugins/pychrysalide/analysis/types/expr.c
@@ -201,7 +201,7 @@ bool ensure_python_expr_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_EXPR_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_EXPR_TYPE, type))
             return false;
 
     }
diff --git a/plugins/pychrysalide/analysis/types/literal.c b/plugins/pychrysalide/analysis/types/literal.c
index e00104f..3d9d5e3 100644
--- a/plugins/pychrysalide/analysis/types/literal.c
+++ b/plugins/pychrysalide/analysis/types/literal.c
@@ -136,7 +136,7 @@ bool ensure_python_literal_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_LITERAL_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_LITERAL_TYPE, type))
             return false;
 
     }
diff --git a/plugins/pychrysalide/analysis/types/override.c b/plugins/pychrysalide/analysis/types/override.c
index 896163f..236a34c 100644
--- a/plugins/pychrysalide/analysis/types/override.c
+++ b/plugins/pychrysalide/analysis/types/override.c
@@ -247,7 +247,7 @@ bool ensure_python_override_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_OVERRIDE_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_OVERRIDE_TYPE, type))
             return false;
 
     }
diff --git a/plugins/pychrysalide/analysis/types/proto.c b/plugins/pychrysalide/analysis/types/proto.c
index 7c3ebed..1da3119 100644
--- a/plugins/pychrysalide/analysis/types/proto.c
+++ b/plugins/pychrysalide/analysis/types/proto.c
@@ -349,7 +349,7 @@ bool ensure_python_proto_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_PROTO_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_PROTO_TYPE, type))
             return false;
 
     }
diff --git a/plugins/pychrysalide/analysis/types/template.c b/plugins/pychrysalide/analysis/types/template.c
index 6fc50e4..68f390a 100644
--- a/plugins/pychrysalide/analysis/types/template.c
+++ b/plugins/pychrysalide/analysis/types/template.c
@@ -345,7 +345,7 @@ bool ensure_python_template_type_is_registered(void)
         if (!ensure_python_data_type_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_TEMPLATE_TYPE, type, get_python_data_type_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_TEMPLATE_TYPE, type))
             return false;
 
     }