From: Jürg Billeter <j@bitron.ch>
Date: Fri, 26 Sep 2008 20:34:10 +0000 (+0000)
Subject: Use correct accessor cname for interface implementations of properties
X-Git-Tag: VALA_0_4_0~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0a36cd89c24c70fd90469c15bf9dbaf7466f0e;p=thirdparty%2Fvala.git

Use correct accessor cname for interface implementations of properties

2008-09-26  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodeclassbinding.vala:

	Use correct accessor cname for interface implementations of
	properties inherited from a base class,
	based on patch by Florian Brosch, fixes bug 548895

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

diff --git a/ChangeLog b/ChangeLog
index c11dcfffd..32b9cc633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-26  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodeclassbinding.vala:
+
+	Use correct accessor cname for interface implementations of
+	properties inherited from a base class,
+	based on patch by Florian Brosch, fixes bug 548895
+
 2008-09-26  Jürg Billeter  <j@bitron.ch>
 
 	* gobject-introspection/scanner.c:
diff --git a/THANKS b/THANKS
index 99ab0fa36..e5b8b0db0 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ The Vala team would like to thank the following contributors:
 
 Abderrahim Kitouni
 Alberto Ruiz
+Alexander Bokovoy
 Alexandre Moreira
 Alexey Lubimov
 Ali Sabil
@@ -23,6 +24,7 @@ Ed Schouten
 Emmanuele Bassi
 Étienne Bersac
 Evan Nemerson
+Florian Brosch
 Francisco Camenforte Torres
 Frederik
 Gabriel Falcão
diff --git a/gobject/valaccodeclassbinding.vala b/gobject/valaccodeclassbinding.vala
index 3c1fec535..10461e80d 100644
--- a/gobject/valaccodeclassbinding.vala
+++ b/gobject/valaccodeclassbinding.vala
@@ -563,9 +563,16 @@ public class Vala.CCodeClassBinding : CCodeObjectTypeSymbolBinding {
 				}
 				if (base_class != null && cl_method.parent_symbol != cl) {
 					// method inherited from base class
-					
+
+					var base_method = cl_method;
+					if (cl_method.base_method != null) {
+						base_method = cl_method.base_method;
+					} else if (cl_method.base_interface_method != null) {
+						base_method = cl_method.base_interface_method;
+					}
+
 					var ciface = new CCodeIdentifier ("iface");
-					init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ciface, m.vfunc_name), new CCodeIdentifier (cl_method.get_cname ()))));
+					init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ciface, m.vfunc_name), new CCodeIdentifier (base_method.get_cname ()))));
 				}
 			}
 		}
@@ -611,15 +618,22 @@ public class Vala.CCodeClassBinding : CCodeObjectTypeSymbolBinding {
 			}
 			if (base_class != null && cl_prop.parent_symbol != cl) {
 				// property inherited from base class
-				
+
+				var base_property = cl_prop;
+				if (cl_prop.base_property != null) {
+					base_property = cl_prop.base_property;
+				} else if (cl_prop.base_interface_property != null) {
+					base_property = cl_prop.base_interface_property;
+				}
+
 				var ciface = new CCodeIdentifier ("iface");
 
-				if (prop.get_accessor != null) {
-					string cname = "%s_real_get_%s".printf (cl.get_lower_case_cname (null), prop.name);
+				if (base_property.get_accessor != null) {
+					string cname = base_property.get_accessor.get_cname ();
 					init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ciface, "get_%s".printf (prop.name)), new CCodeIdentifier (cname))));
 				}
-				if (prop.set_accessor != null) {
-					string cname = "%s_real_set_%s".printf (cl.get_lower_case_cname (null), prop.name);
+				if (base_property.set_accessor != null) {
+					string cname = base_property.set_accessor.get_cname ();
 					init_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (ciface, "set_%s".printf (prop.name)), new CCodeIdentifier (cname))));
 				}
 			}