vala r1321 - in trunk: . gobject

[malureau svn gnome org]

Author: malureau
Date: Sat Apr 26 11:31:03 2008
New Revision: 1321
URL: http://svn.gnome.org/viewvc/vala?rev=1321&view=rev

Log:
2008-04-26  Marc-Andrà Lureau  <marcandre lureau gmail com>

	* gobject/valaccodedynamicmethodbinding.vala: fix dbus strv
	handler argument order, fixes bug 528412


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodedynamicmethodbinding.vala

Modified: trunk/gobject/valaccodedynamicmethodbinding.vala
==============================================================================
--- trunk/gobject/valaccodedynamicmethodbinding.vala	(original)
+++ trunk/gobject/valaccodedynamicmethodbinding.vala	Sat Apr 26 11:31:03 2008
@@ -147,14 +147,18 @@
 					if (param.type_reference is ArrayType && ((ArrayType) param.type_reference).element_type.data_type == codegen.string_type.data_type) {
 						// special case string array
 						cend_call.add_argument (new CCodeIdentifier ("G_TYPE_STRV"));
-						var cstrvlen = new CCodeFunctionCall (new CCodeIdentifier ("g_strv_length"));
-						cstrvlen.add_argument (new CCodeIdentifier (param.name));
-						creply_call.add_argument (cstrvlen);
 					} else {
 						cend_call.add_argument (new CCodeIdentifier (param.type_reference.data_type.get_type_id ()));
 					}
 					cend_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier (param.name)));
 					creply_call.add_argument (new CCodeIdentifier (param.name));
+
+					if (param.type_reference is ArrayType && ((ArrayType) param.type_reference).element_type.data_type == codegen.string_type.data_type) {
+						var cstrvlen = new CCodeFunctionCall (new CCodeIdentifier ("g_strv_length"));
+						cstrvlen.add_argument (new CCodeIdentifier (param.name));
+						creply_call.add_argument (cstrvlen);
+					}
+
 				}
 			}
 			cend_call.add_argument (new CCodeIdentifier ("G_TYPE_INVALID"));