From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 26 Aug 2017 10:48:38 +0000 (+0200)
Subject: girparser: Better support of "cprefix" argument in metadata
X-Git-Tag: 0.37.91~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ed9220cfa0927c22aa3ed0b8a038d23495fdd8;p=thirdparty%2Fvala.git

girparser: Better support of "cprefix" argument in metadata
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index ff2e3d3d7..f030c08ca 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -715,7 +715,12 @@ public class Vala.GirParser : CodeVisitor {
 			if (name == null) {
 				return "";
 			}
-			var prefix = symbol.get_attribute_string ("CCode", "cprefix");
+			string prefix;
+			if (metadata.has_argument (ArgumentType.CPREFIX)) {
+				prefix = metadata.get_string (ArgumentType.CPREFIX);
+			} else {
+				prefix = symbol.get_attribute_string ("CCode", "cprefix");
+			}
 			if (prefix == null && girdata != null && girdata["c:identifier-prefixes"] != null) {
 				prefix = girdata["c:identifier-prefixes"];
 				int idx = prefix.index_of (",");