D-Bus: Fix invalid code generated for error handling in servers

diff --git a/codegen/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
index a7555a56153a4294f94cad5ed74ddc7586fba7a7..d29f27ec0d72b4fc084e1446086c4afb5e7291cd 100644 (file)
--- a/codegen/valadbusservermodule.vala
+++ b/codegen/valadbusservermodule.vala
@@ -328,7 +328,8 @@ internal class Vala.DBusServerModule : DBusClientModule {
                        msgcall.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("error"), "message"));
                        error_block.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("reply"), msgcall)));
 
-                       error_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("reply")));
+                       send_reply (error_block);
+                       error_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("DBUS_HANDLER_RESULT_HANDLED")));
 
                        block.add_statement (new CCodeIfStatement (new CCodeIdentifier ("error"), error_block));
                }