From: Jürg Billeter <j@bitron.ch>
Date: Wed, 21 Mar 2012 16:31:04 +0000 (+0100)
Subject: codegen: Fix delegate target C name for static fields
X-Git-Tag: 0.16.0~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b14d21a881902e19f43efdeae1bfbf3b22db859;p=thirdparty%2Fvala.git

codegen: Fix delegate target C name for static fields

Fixes bug 671110.
---

diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala
index d019ce71d..49900dc61 100644
--- a/codegen/valaccodeattribute.vala
+++ b/codegen/valaccodeattribute.vala
@@ -461,7 +461,7 @@ public class Vala.CCodeAttribute : AttributeCache {
 					_delegate_target_name = ccode.get_string ("delegate_target_cname");
 				}
 				if (_delegate_target_name == null) {
-					_delegate_target_name = "%s_target".printf (sym.name);
+					_delegate_target_name = "%s_target".printf (name);
 				}
 			}
 			return _delegate_target_name;
@@ -610,6 +610,8 @@ public class Vala.CCodeAttribute : AttributeCache {
 				} else {
 					return "%s%s".printf (CCodeBaseModule.get_ccode_prefix (sym.parent_symbol), sym.name);
 				}
+			} else if (sym is LocalVariable || sym is Parameter) {
+				return sym.name;
 			} else {
 				return "%s%s".printf (CCodeBaseModule.get_ccode_prefix (sym.parent_symbol), sym.name);
 			}