From: Jürg Billeter <j@bitron.ch>
Date: Fri, 22 Oct 2010 13:01:42 +0000 (+0200)
Subject: D-Bus: Ignore non-abstract methods in interfaces of GDBus clients
X-Git-Tag: 0.11.1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0026a2b70cf31ba235ad73252c75415e277bf35d;p=thirdparty%2Fvala.git

D-Bus: Ignore non-abstract methods in interfaces of GDBus clients
---

diff --git a/codegen/valagdbusclientmodule.vala b/codegen/valagdbusclientmodule.vala
index 27cda2583..1a6c5bdad 100644
--- a/codegen/valagdbusclientmodule.vala
+++ b/codegen/valagdbusclientmodule.vala
@@ -82,6 +82,10 @@ public class Vala.GDBusClientModule : GDBusModule {
 		var iface_block = new CCodeBlock ();
 
 		foreach (Method m in iface.get_methods ()) {
+			if (!m.is_abstract) {
+				continue;
+			}
+
 			var vfunc_entry = new CCodeMemberAccess.pointer (new CCodeIdentifier ("iface"), m.vfunc_name);
 			if (!m.coroutine) {
 				iface_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (vfunc_entry, new CCodeIdentifier (generate_dbus_proxy_method (main_iface, iface, m)))));
@@ -93,6 +97,10 @@ public class Vala.GDBusClientModule : GDBusModule {
 		}
 
 		foreach (Property prop in iface.get_properties ()) {
+			if (!prop.is_abstract) {
+				continue;
+			}
+
 			if (prop.get_accessor != null) {
 				var vfunc_entry = new CCodeMemberAccess.pointer (new CCodeIdentifier ("iface"), "get_" + prop.name);
 				iface_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (vfunc_entry, new CCodeIdentifier (generate_dbus_proxy_property_get (main_iface, iface, prop)))));