girparser: Better support of "cprefix" argument in metadata

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index ff2e3d3d71fdf71a994682d0d3ffd77ccb7768da..f030c08cae7f3710f7529ba34683e3206f8160ba 100644 (file)
--- 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 (",");