vala r1332 - in trunk: . gobject-introspection

[juergbi svn gnome org]

Author: juergbi
Date: Fri May  2 19:00:33 2008
New Revision: 1332
URL: http://svn.gnome.org/viewvc/vala?rev=1332&view=rev

Log:
2008-05-02  Juerg Billeter  <j bitron ch>

	* gobject-introspection/scanner.c: (g_igenerator_add_symbol):

	Do not add duplicate symbols,
	patch by Etienne Bersac, fixes bug 528254


Modified:
   trunk/ChangeLog
   trunk/gobject-introspection/scanner.c

Modified: trunk/gobject-introspection/scanner.c
==============================================================================
--- trunk/gobject-introspection/scanner.c	(original)
+++ trunk/gobject-introspection/scanner.c	Fri May  2 19:00:33 2008
@@ -1186,6 +1186,7 @@
 {
   /* only add symbols of main file */
   gboolean found_filename = FALSE;
+
   GList *l;
   for (l = igenerator->filenames; l != NULL; l = l->next)
     {
@@ -1199,6 +1200,16 @@
   symbol->directives = g_slist_reverse (igenerator->directives);
   igenerator->directives = NULL;
 
+  /* that's not very optimized ! */
+  for (l = igenerator->symbol_list; l != NULL; l = l->next)
+    {
+      if (g_str_equal (((CSymbol*)l->data)->ident, symbol->ident))
+        {
+          g_printerr ("Dropping %s duplicate\n", symbol->ident);
+          return;
+        }
+  }
+
   if (found_filename || igenerator->macro_scan)
     {
       igenerator->symbol_list =