Ensure we always have types for container nodes

svn path=/trunk/; revision=638

diff --git a/girepository/girparser.c b/girepository/girparser.c
index 88f7c78..fbdea58 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -1506,12 +1506,16 @@ end_type_top (ParseContext *ctx)
       typenode->tag == GI_TYPE_TAG_GLIST ||
       typenode->tag == GI_TYPE_TAG_GSLIST)
     {
-      typenode->parameter_type1 = parse_type (ctx, "any");
+      if (typenode->parameter_type1 == NULL)
+       typenode->parameter_type1 = parse_type (ctx, "any");
     }
   else if (typenode->tag == GI_TYPE_TAG_GHASH)
     {
-      typenode->parameter_type1 = parse_type (ctx, "any");
-      typenode->parameter_type2 = parse_type (ctx, "any");
+      if (typenode->parameter_type1 == NULL)
+       {
+         typenode->parameter_type1 = parse_type (ctx, "any");
+         typenode->parameter_type2 = parse_type (ctx, "any");
+       }
     }
 
   switch (ctx->current_typed->type)