From fca0295cc05f9d344d43d9db5dba07d191a05ea6 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 27 Feb 2019 15:45:13 +0100
Subject: [PATCH] girwriter: Always use get_gir_name() for TypeSymbols

---
 codegen/valagirwriter.vala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 6e073541a..fb39686eb 100644
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -367,7 +367,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++;
 
@@ -507,7 +507,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));
@@ -538,7 +538,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++;
 
-- 
2.47.2