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

Fixes bug 631044.

diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala
index 066d969edee868d375622e693df8326fad94c355..72c9368ccfa9f9f487cc925e68f7202edac59894 100644 (file)
--- 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 () + "*"));