From: Evan Nemerson <evan@nemerson.com>
Date: Fri, 27 Jun 2014 04:47:09 +0000 (-0700)
Subject: girwriter: fall back on gir_namespace if GIR name is not available
X-Git-Tag: 0.25.1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e603584237ba6c83f3aee1f819975c077939669;p=thirdparty%2Fvala.git

girwriter: fall back on gir_namespace if GIR name is not available
---

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index d2a22668e..9ef70a63b 100644
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -1338,7 +1338,15 @@ public class Vala.GIRWriter : CodeVisitor {
 	}
 
 	private string? get_full_gir_name (Symbol sym) {
-		var gir_name = sym.get_attribute_string ("GIR", "name") ?? sym.name;
+		string? gir_name = sym.get_attribute_string ("GIR", "name");
+
+		if (gir_name == null && sym is Namespace) {
+			gir_name = sym.get_attribute_string ("CCode", "gir_namespace");
+		}
+		if (gir_name == null) {
+			gir_name = sym.name;
+		}
+
 		if (sym.parent_symbol == null) {
 			return gir_name;
 		}