girparser: Reuse populated Node.gtype_struct_for instead of resolving again

This fixes the discovery of non-default type_cname for re-parented symbols.

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 836d2436f5455bc56eea29a0e4e4b86f13b977d3..02e9bbc68c11da60729b49ecf4605d8d391971bb 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1213,9 +1213,8 @@ public class Vala.GirParser : CodeVisitor {
                                                merged = true;
                                        } else {
                                                // record for a gtype
-                                               var gtype_struct_for = girdata["glib:is-gtype-struct-for"];
                                                if (gtype_struct_for != null) {
-                                                       var obj = parser.resolve_node (parent, parser.parse_symbol_from_string (gtype_struct_for, source_reference));
+                                                       var obj = parser.resolve_node (parent, gtype_struct_for);
                                                        if (obj != null && obj.symbol is Interface && "%sIface".printf (obj.get_cname ()) != get_cname ()) {
                                                                // set the interface struct name
                                                                obj.symbol.set_attribute_string ("CCode", "type_cname", get_cname ());