From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 6 Jan 2011 11:22:04 +0000 (+0100)
Subject: girparser: Fix processing deprecation.
X-Git-Tag: 0.13.0~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb0899d9f2d64b23ffa01a23da5726a54685bf40;p=thirdparty%2Fvala.git

girparser: Fix processing deprecation.
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index eaddd1d86..f84d6d7f4 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1063,10 +1063,13 @@ public class Vala.GirParser : CodeVisitor {
 		}
 	}
 
-	void postprocess_symbol (Symbol sym, Metadata metadata) {
+	void postprocess_symbol (Symbol sym, Metadata metadata, Map<string,string> girdata) {
 		// deprecation
 		sym.replacement = metadata.get_string (ArgumentType.REPLACEMENT);
-		sym.deprecated_since = element_get_string ("deprecated-version", ArgumentType.DEPRECATED_SINCE);
+		sym.deprecated_since = metadata.get_string (ArgumentType.DEPRECATED_SINCE);
+		if (sym.deprecated_since == null) {
+			sym.deprecated_since = girdata.get ("deprecated-version");
+		}
 		sym.deprecated = metadata.get_bool (ArgumentType.DEPRECATED) || sym.replacement != null || sym.deprecated_since != null;
 
 		// cheader filename
@@ -1119,7 +1122,7 @@ public class Vala.GirParser : CodeVisitor {
 			if (!(current_symbol is Namespace && info.symbol is Method) && !info.metadata.has_argument (ArgumentType.PARENT)) {
 				add_symbol_to_container (container, info.symbol);
 			}
-			postprocess_symbol (info.symbol, info.metadata);
+			postprocess_symbol (info.symbol, info.metadata, info.girdata);
 		}
 	}