From: Jürg Billeter <j@bitron.ch>
Date: Wed, 20 Oct 2010 21:48:38 +0000 (+0200)
Subject: D-Bus: Fix overriding and interface methods in GDBus servers
X-Git-Tag: 0.10.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535d4de37a3ca5193bbb9d033cfa43e555e56d47;p=thirdparty%2Fvala.git

D-Bus: Fix overriding and interface methods in GDBus servers

Fixes bug 631044.
---

diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala
index 066d969ed..72c9368cc 100644
--- a/codegen/valagdbusservermodule.vala
+++ b/codegen/valagdbusservermodule.vala
@@ -52,6 +52,12 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 
 		CCodeDeclaration cdecl;
 
+		if (m.base_method != null) {
+			m = m.base_method;
+		} else if (m.base_interface_method != null) {
+			m = m.base_interface_method;
+		}
+
 		var function = new CCodeFunction (wrapper_name);
 		function.modifiers = CCodeModifiers.STATIC;
 		function.add_parameter (new CCodeFormalParameter ("self", sym.get_cname () + "*"));