From 68f40d33188196a5cd61869f1c8064eed9cf28d8 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Sat, 15 Mar 2008 21:54:22 +0000 Subject: [PATCH] fix support for array return types for D-Bus method calls 2008-03-15 Juerg Billeter * gobject/valaccodegeneratorinvocationexpression.vala: fix support for array return types for D-Bus method calls svn path=/trunk/; revision=1129 --- ChangeLog | 5 +++++ gobject/valaccodegeneratorinvocationexpression.vala | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a08e32e..1acddcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-03-15 Jürg Billeter + * gobject/valaccodegeneratorinvocationexpression.vala: fix support + for array return types for D-Bus method calls + +2008-03-15 Jürg Billeter + * gobject/valaccodegeneratorinvocationexpression.vala: fix crash when using arrays for D-Bus method calls diff --git a/gobject/valaccodegeneratorinvocationexpression.vala b/gobject/valaccodegeneratorinvocationexpression.vala index bcda0d2..97d952a 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 -- 2.7.4