girwriter: Always use get_gir_name() for TypeSymbols

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index a1a82cd7b48ef9dc6ce9cd5322cfe875c49425e7..4373ec8bbf4fd5cb4273c96f97ad4d5362b691f0 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -370,7 +370,7 @@ public class Vala.GIRWriter : CodeVisitor {
                        write_indent ();
                        buffer.append_printf ("<record name=\"%s\"", gtype_struct_name);
                        write_ctype_attributes (cl, "Class");
-                       buffer.append_printf (" glib:is-gtype-struct-for=\"%s\"", cl.name);
+                       buffer.append_printf (" glib:is-gtype-struct-for=\"%s\"", get_gir_name (cl));
                        buffer.append_printf (">\n");
                        indent++;
 
@@ -510,7 +510,7 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
-               string gtype_struct_name = iface.name + "Iface";
+               string gtype_struct_name = get_gir_name (iface) + "Iface";
 
                write_indent ();
                buffer.append_printf ("<interface name=\"%s\"", get_gir_name (iface));
@@ -541,7 +541,7 @@ public class Vala.GIRWriter : CodeVisitor {
                write_indent ();
                buffer.append_printf ("<record name=\"%s\"", gtype_struct_name);
                write_ctype_attributes (iface, "Iface");
-               buffer.append_printf (" glib:is-gtype-struct-for=\"%s\"", iface.name);
+               buffer.append_printf (" glib:is-gtype-struct-for=\"%s\"", get_gir_name (iface));
                buffer.append_printf (">\n");
                indent++;