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

Fixes bug 631044.

diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala
index 4ba4eebd60f9e3ffbe6471b0c5e113bc36f42d0f..7bb9a4313292af29d2b3db15c0b83d8ef5ef6205 100644 (file)
--- 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";