summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuerg Billeter <j@bitron.ch>2008-03-15 21:54:22 +0000
committerJürg Billeter <juergbi@src.gnome.org>2008-03-15 21:54:22 +0000
commit68f40d33188196a5cd61869f1c8064eed9cf28d8 (patch)
tree6f070da2753dcecadeb7e98dcb89db5c938a8a48
parentecedf6012d1a546cae4c46e2c9e3d13b2488642d (diff)
downloadvala-68f40d33188196a5cd61869f1c8064eed9cf28d8.tar.gz
fix support for array return types for D-Bus method calls
2008-03-15 Juerg Billeter <j@bitron.ch> * gobject/valaccodegeneratorinvocationexpression.vala: fix support for array return types for D-Bus method calls svn path=/trunk/; revision=1129
-rw-r--r--ChangeLog5
-rw-r--r--gobject/valaccodegeneratorinvocationexpression.vala2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a08e32eab..1acddcf8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-15 Jürg Billeter <j@bitron.ch>
+ * gobject/valaccodegeneratorinvocationexpression.vala: fix support
+ for array return types for D-Bus method calls
+
+2008-03-15 Jürg Billeter <j@bitron.ch>
+
* gobject/valaccodegeneratorinvocationexpression.vala: fix crash
when using arrays for D-Bus method calls
diff --git a/gobject/valaccodegeneratorinvocationexpression.vala b/gobject/valaccodegeneratorinvocationexpression.vala
index bcda0d2ff..97d952a3f 100644
--- a/gobject/valaccodegeneratorinvocationexpression.vala
+++ b/gobject/valaccodegeneratorinvocationexpression.vala
@@ -194,7 +194,7 @@ public class Vala.CCodeGenerator {
carg_map.set (get_param_pos (0.2), new CCodeIdentifier (cb_fun.name));
carg_map.set (get_param_pos (0.3), new CCodeConstant ("self"));
carg_map.set (get_param_pos (0.4), new CCodeConstant ("NULL"));
- } else if (found_out || m.return_type.data_type != null) {
+ } else if (found_out || !(m.return_type is VoidType)) {
ccall.call = new CCodeIdentifier ("dbus_g_proxy_call");
// method can fail