From 032f2d973bd5c9a9b457cb5fc72d13dafe85c01e Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Thu, 22 May 2008 21:20:42 +0000
Subject: [PATCH] gstdoc-scangobj: Emit warnings if one of the GTypes we're
 expecting is 0 when scanning.

Original commit message from CVS:
* gstdoc-scangobj:
Emit warnings if one of the GTypes we're expecting is 0
when scanning.
---
 ChangeLog       |  6 ++++++
 gstdoc-scangobj | 31 ++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28b21df..221550c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-22  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gstdoc-scangobj:
+	Emit warnings if one of the GTypes we're expecting is 0
+	when scanning.
+
 2008-05-21  Felipe Contreras  <felipe.contreras@gmail.com>
 
 	* gtk-doc-plugins.mak:
diff --git a/gstdoc-scangobj b/gstdoc-scangobj
index 1d46dc9..d246dd2 100755
--- a/gstdoc-scangobj
+++ b/gstdoc-scangobj
@@ -142,6 +142,7 @@ get_object_types (void)
     GList *factories = NULL;
     GList *l;
     GstElementFactory *factory = NULL;
+    GType type;
 
     gint i = 0;
 
@@ -192,11 +193,15 @@ get_object_types (void)
 
     /* fill it */
     while (l) {
-      GType type;
       factory = GST_ELEMENT_FACTORY (l->data);
       type = gst_element_factory_get_element_type (factory);
-      g_message ("adding type %p for factory %s", (void *) type, gst_element_factory_get_longname (factory));
-      object_types[i++] = type;
+      if (type != 0) {
+        g_message ("adding type %p for factory %s", (void *) type, gst_element_factory_get_longname (factory));
+        object_types[i++] = type;
+      } else {
+        g_message ("type info for factory %s not found",
+            gst_element_factory_get_longname (factory));
+      }
       l = g_list_next (l);
     }
 
@@ -204,12 +209,28 @@ EOT
 
 # get_type functions:
 for (@types) {
-    print OUTPUT "    object_types[i++] = $_ ();\n";
+print OUTPUT <<EOT;
+    type = $_ ();
+    if (type == 0) {
+      g_message ("$_ () didn't return a valid type");
+    }
+    else {
+      object_types[i++] = type;
+    }
+EOT
 }
 
 # Implicit types retrieved from GLib:
 for (@impl_types) {
-    print OUTPUT "    object_types[i++] = g_type_from_name (\"$_\");\n";
+print OUTPUT <<EOT;
+    type = g_type_from_name ("$_");
+    if (type == 0) {
+      g_message ("Implicit type $_ not found");
+    }
+    else {
+      object_types[i++] = type;
+    }
+EOT
 }
 
 print OUTPUT <<EOT;
-- 
2.7.4