From: Jürg Billeter <j@bitron.ch>
Date: Sun, 13 Sep 2009 20:05:49 +0000 (+0200)
Subject: D-Bus: Fix invalid code generated for error handling in servers
X-Git-Tag: 0.7.6~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f547fae32564b2bdfe788e6fec1ba6a2f7537d05;p=thirdparty%2Fvala.git

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

diff --git a/codegen/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
index a7555a561..d29f27ec0 100644
--- 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));
 		}