better debug warnings

3 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b8a0f6..be03711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-29  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
+
+	* gobject/pygflags.c (pyg_flags_add): idem.
+
+	* gobject/pygenum.c (pyg_enum_add): Give a more explicit error
+	message when the gtype is not an enum.
+
 2006-07-25  Johan Dahlin  <jdahlin@async.com.br>
 
 	* gobject/pygobject.h (init_pygobject_check): Add a macro to easily 
diff --git a/gobject/pygenum.c b/gobject/pygenum.c
index d1bb20f..305dd68 100644
--- a/gobject/pygenum.c
+++ b/gobject/pygenum.c
@@ -174,7 +174,11 @@ pyg_enum_add (PyObject *   module,
     int i;
     
     g_return_val_if_fail(typename != NULL, NULL);
-    g_return_val_if_fail(g_type_is_a(gtype, G_TYPE_ENUM), NULL);
+    if (!g_type_is_a(gtype, G_TYPE_ENUM)) {
+        g_warning("Trying to register gtype '%s' as enum when in fact it is of type '%s'",
+                  g_type_name(gtype), g_type_name(G_TYPE_FUNDAMENTAL(gtype)));
+        return NULL;
+    }
     
     state = pyg_gil_state_ensure();
 
diff --git a/gobject/pygflags.c b/gobject/pygflags.c
index 442e332..bfd5128 100644
--- a/gobject/pygflags.c
+++ b/gobject/pygflags.c
@@ -202,7 +202,11 @@ pyg_flags_add (PyObject *   module,
     int i;
 
     g_return_val_if_fail(typename != NULL, NULL);
-    g_return_val_if_fail(g_type_is_a(gtype, G_TYPE_FLAGS), NULL);
+    if (!g_type_is_a(gtype, G_TYPE_FLAGS)) {
+        g_warning("Trying to register gtype '%s' as flags when in fact it is of type '%s'",
+                  g_type_name(gtype), g_type_name(G_TYPE_FUNDAMENTAL(gtype)));
+        return NULL;
+    }
     
     state = pyg_gil_state_ensure();