From: Juerg Billeter <j@bitron.ch>
Date: Mon, 21 Apr 2008 19:57:39 +0000 (+0000)
Subject: generate unique names for wrapper methods, fixes bug 529251
X-Git-Tag: VALA_0_3_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24bbce461ba132cdc2fcf97ca8586cd4e38910bf;p=thirdparty%2Fvala.git

generate unique names for wrapper methods, fixes bug 529251

2008-04-21  Juerg Billeter  <j@bitron.ch>

	* vala/valadynamicmethod.vala: generate unique names for wrapper
	  methods, fixes bug 529251

svn path=/trunk/; revision=1298
---

diff --git a/ChangeLog b/ChangeLog
index 1c6fcf677..10c60cf77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valadynamicmethod.vala: generate unique names for wrapper
+	  methods, fixes bug 529251
+
 2008-04-21  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/packages/libglade-2.0/: fix glade_xml_construct binding,
diff --git a/vala/valadynamicmethod.vala b/vala/valadynamicmethod.vala
index d63146c34..054ba1e79 100644
--- a/vala/valadynamicmethod.vala
+++ b/vala/valadynamicmethod.vala
@@ -32,6 +32,7 @@ public class Vala.DynamicMethod : Method {
 	public InvocationExpression invocation { get; set; }
 
 	private string cname;
+	static int dynamic_method_id;
 
 	public DynamicMethod (DataType dynamic_type, string name, DataType return_type, SourceReference? source_reference = null) {
 		this.dynamic_type = dynamic_type;
@@ -47,8 +48,7 @@ public class Vala.DynamicMethod : Method {
 	public override string get_default_cname () {
 		// return cname of wrapper method
 		if (cname == null) {
-			// FIXME support multiple dynamic methods with the same name
-			cname = "_dynamic_%s".printf (name);
+			cname = "_dynamic_%s%d".printf (name, dynamic_method_id++);
 		}
 		return cname;
 	}