From 24bbce461ba132cdc2fcf97ca8586cd4e38910bf Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Mon, 21 Apr 2008 19:57:39 +0000 Subject: [PATCH] generate unique names for wrapper methods, fixes bug 529251 2008-04-21 Juerg Billeter * vala/valadynamicmethod.vala: generate unique names for wrapper methods, fixes bug 529251 svn path=/trunk/; revision=1298 --- ChangeLog | 5 +++++ vala/valadynamicmethod.vala | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c6fcf6..10c60cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-04-21 Jürg Billeter + * vala/valadynamicmethod.vala: generate unique names for wrapper + methods, fixes bug 529251 + +2008-04-21 Jürg Billeter + * vapi/packages/libglade-2.0/: fix glade_xml_construct binding, patch by Christian Meyer diff --git a/vala/valadynamicmethod.vala b/vala/valadynamicmethod.vala index d63146c..054ba1e 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; } -- 2.7.4