From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 26 Aug 2017 10:43:53 +0000 (+0200)
Subject: girparser: Support "cname" argument in metadata
X-Git-Tag: 0.37.91~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bcfd0be082b7f6317b7eeebc899a1885840036d;p=thirdparty%2Fvala.git

girparser: Support "cname" argument in metadata
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 219728c1e..ff2e3d3d7 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -85,7 +85,8 @@ public class Vala.GirParser : CodeVisitor {
 		RETURN_VOID,
 		RETURNS_MODIFIED_POINTER,
 		DELEGATE_TARGET_CNAME,
-		FINISH_VFUNC_NAME;
+		FINISH_VFUNC_NAME,
+		CNAME;
 
 		public static ArgumentType? from_string (string name) {
 			var enum_class = (EnumClass) typeof(ArgumentType).class_ref ();
@@ -736,7 +737,12 @@ public class Vala.GirParser : CodeVisitor {
 			if (name == null) {
 				return "";
 			}
-			var cname = symbol.get_attribute_string ("CCode", "cname");
+			string cname;
+			if (metadata.has_argument (ArgumentType.CNAME)) {
+				cname = metadata.get_string (ArgumentType.CNAME);
+			} else {
+				cname = symbol.get_attribute_string ("CCode", "cname");
+			}
 			if (girdata != null) {
 				if (cname == null) {
 					cname = girdata["c:identifier"];