vala r2464 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Feb 20 17:04:24 2009
New Revision: 2464
URL: http://svn.gnome.org/viewvc/vala?rev=2464&view=rev

Log:
2009-02-20  JÃrg Billeter  <j bitron ch>

	* gobject/valadbusclientmodule.vala:

	Support error handling when dynamically calling void methods,
	patch by Frederik Sdun, fixes bug 571258


Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/gobject/valadbusclientmodule.vala

Modified: trunk/THANKS
==============================================================================
--- trunk/THANKS	(original)
+++ trunk/THANKS	Fri Feb 20 17:04:24 2009
@@ -30,6 +30,7 @@
 Florian Brosch
 Francisco Camenforte Torres
 Frederik
+Frederik Sdun
 Gabriel FalcÃo
 Geert Jan Alsem
 GÃtz Waschk

Modified: trunk/gobject/valadbusclientmodule.vala
==============================================================================
--- trunk/gobject/valadbusclientmodule.vala	(original)
+++ trunk/gobject/valadbusclientmodule.vala	Fri Feb 20 17:04:24 2009
@@ -184,12 +184,10 @@
 			ccall.add_argument (new CCodeIdentifier (cb_fun.name));
 			ccall.add_argument (new CCodeConstant ("param%d_target".printf (callback_index)));
 			ccall.add_argument (new CCodeConstant ("NULL"));
-		} else if (found_out || !(method.return_type is VoidType)) {
+		} else { 
 			ccall.call = new CCodeIdentifier ("dbus_g_proxy_call");
 
 			ccall.add_argument (new CCodeIdentifier ("error"));
-		} else {
-			ccall.call = new CCodeIdentifier ("dbus_g_proxy_call_no_reply");
 		}
 
 		foreach (FormalParameter param in method.get_parameters ()) {
@@ -433,9 +431,7 @@
 				block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("result")));
 			}
 		} else {
-			if (found_out) {
-				ccall.add_argument (new CCodeIdentifier ("G_TYPE_INVALID"));
-			}
+			ccall.add_argument (new CCodeIdentifier ("G_TYPE_INVALID"));
 
 			block.add_statement (new CCodeExpressionStatement (ccall));