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.11.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7d33d104e46f50d0ec8492d288173cffbaf11f3;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 4ba4eebd6..7bb9a4313 100644
--- a/codegen/valagdbusservermodule.vala
+++ b/codegen/valagdbusservermodule.vala
@@ -48,6 +48,12 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 	string generate_dbus_wrapper (Method m, ObjectTypeSymbol sym, bool ready = false) {
 		string wrapper_name = "_dbus_%s".printf (m.get_cname ());
 
+		if (m.base_method != null) {
+			m = m.base_method;
+		} else if (m.base_interface_method != null) {
+			m = m.base_interface_method;
+		}
+
 		if (ready) {
 			// async ready function
 			wrapper_name += "_ready";