From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Mon, 19 Apr 2010 09:43:25 +0000 (-0700)
Subject: vapigen: support type_arguments for signal/delegate return types
X-Git-Tag: 0.9.1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=340285aec53d822d176443bff444c1919ce70374;p=thirdparty%2Fvala.git

vapigen: support type_arguments for signal/delegate return types

Fixes bug 615837.
---

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index a309e9ee5..3f25d23f1 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -305,6 +305,11 @@ public class Vala.GIdlParser : CodeVisitor {
 					if (eval (nv[1]) == "1") {
 						return_type.value_owned = true;
 					}
+				} else if (nv[0] == "type_arguments") {
+					var type_args = eval (nv[1]).split (",");
+					foreach (string type_arg in type_args) {
+						return_type.add_type_argument (get_type_from_string (type_arg));
+					}
 				} else if (nv[0] == "instance_pos") {
 					cb.cinstance_parameter_position = eval (nv[1]).to_double ();
 				}
@@ -2248,6 +2253,11 @@ public class Vala.GIdlParser : CodeVisitor {
 					if (eval (nv[1]) == "1") {
 						sig.return_type.value_owned = true;
 					}
+				} else if (nv[0] == "type_arguments") {
+					var type_args = eval (nv[1]).split (",");
+					foreach (string type_arg in type_args) {
+						sig.return_type.add_type_argument (get_type_from_string (type_arg));
+					}
 				}
 			}
 		}