vala r1672 - in trunk: . gobject-introspection

[juergbi svn gnome org]

Author: juergbi
Date: Thu Jul  3 11:55:59 2008
New Revision: 1672
URL: http://svn.gnome.org/viewvc/vala?rev=1672&view=rev

Log:
2008-07-03  JÃrg Billeter  <j bitron ch>

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

	Only drop duplicates of the same namespace


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	Thu Jul  3 11:55:59 2008
@@ -1203,7 +1203,9 @@
   /* 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))
+      CSymbol *other_symbol = (CSymbol *)l->data;
+      if (g_str_equal (other_symbol->ident, symbol->ident)
+          && other_symbol->type == symbol->type)
         {
           g_printerr ("Dropping %s duplicate\n", symbol->ident);
           return;