From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 27 Feb 2019 14:45:13 +0000 (+0100)
Subject: girwriter: Always use get_gir_name() for TypeSymbols
X-Git-Tag: 0.43.92~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=194195123f458e9f9502acc6bb835c0717b6fee6;p=thirdparty%2Fvala.git

girwriter: Always use get_gir_name() for TypeSymbols
---

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index a1a82cd7b..4373ec8bb 100644
--- 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++;