Only drop duplicates of the same namespace

2008-07-03  Jürg Billeter  <j@bitron.ch>

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

	Only drop duplicates of the same namespace

svn path=/trunk/; revision=1672

diff --git a/ChangeLog b/ChangeLog
index 74ab2e5e7450a113e5a2dc4338c58d0f37863fd8..02bb136f741a5aaea8a2d1836b619ecf70af4712 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-03  Jürg Billeter  <j@bitron.ch>
+
+       * gobject-introspection/scanner.c: (g_igenerator_add_symbol):
+
+       Only drop duplicates of the same namespace
+
 2008-07-02  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegeneratorsourcefile.vala:

diff --git a/gobject-introspection/scanner.c b/gobject-introspection/scanner.c
index 2feb5eac68c17ac5e9bb458d37c5e8214f26cb3e..3b186cf6d7221a9be1bc70b33fecad2b90cbade4 100644 (file)
--- a/gobject-introspection/scanner.c
+++ b/gobject-introspection/scanner.c
@@ -1203,7 +1203,9 @@ g_igenerator_add_symbol (GIGenerator * igenerator, CSymbol * symbol)
   /* 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;