From: Feng Yu <fengyu@dhcp5-240.iucf.indiana.edu>
Date: Sat, 28 Mar 2009 19:20:39 +0000 (-0400)
Subject: Use vfunc_name for base access
X-Git-Tag: 0.6.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8853416eb94673c439f470f3625f9b8e33e424;p=thirdparty%2Fvala.git

Use vfunc_name for base access

Base access should respect Method.vfunc_name instead of using
Method.name. Fixes bug 577114.
---

diff --git a/gobject/valaccodememberaccessmodule.vala b/gobject/valaccodememberaccessmodule.vala
index a5baff196..d2731e8af 100644
--- a/gobject/valaccodememberaccessmodule.vala
+++ b/gobject/valaccodememberaccessmodule.vala
@@ -52,13 +52,13 @@ internal class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
 					var vcast = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf (base_class.get_upper_case_cname (null))));
 					vcast.add_argument (new CCodeIdentifier ("%s_parent_class".printf (current_class.get_lower_case_cname (null))));
 					
-					expr.ccodenode = new CCodeMemberAccess.pointer (vcast, m.name);
+					expr.ccodenode = new CCodeMemberAccess.pointer (vcast, m.vfunc_name);
 					return;
 				} else if (m.base_interface_method != null) {
 					var base_iface = (Interface) m.base_interface_method.parent_symbol;
 					string parent_iface_var = "%s_%s_parent_iface".printf (current_class.get_lower_case_cname (null), base_iface.get_lower_case_cname (null));
 
-					expr.ccodenode = new CCodeMemberAccess.pointer (new CCodeIdentifier (parent_iface_var), m.name);
+					expr.ccodenode = new CCodeMemberAccess.pointer (new CCodeIdentifier (parent_iface_var), m.vfunc_name);
 					return;
 				}
 			}