vala r1348 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Thu May  8 21:02:22 2008
New Revision: 1348
URL: http://svn.gnome.org/viewvc/vala?rev=1348&view=rev

Log:
2008-05-08  Juerg Billeter  <j bitron ch>

	* gobject/valaccodegeneratorsignal.vala:

	Fix string return type for marshallers,
	patch by Yu Feng, fixes bug 531137


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

Modified: trunk/gobject/valaccodegeneratorsignal.vala
==============================================================================
--- trunk/gobject/valaccodegeneratorsignal.vala	(original)
+++ trunk/gobject/valaccodegeneratorsignal.vala	Thu May  8 21:02:22 2008
@@ -251,10 +251,10 @@
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_set_pointer"));
 			} else if (return_type is ErrorType) {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_set_pointer"));
-			} else if (return_type.data_type is Class || return_type.data_type is Interface) {
-				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_object"));
 			} else if (return_type.data_type == string_type.data_type) {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_string"));
+			} else if (return_type.data_type is Class || return_type.data_type is Interface) {
+				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_object"));
 			} else {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier (return_type.data_type.get_set_value_function ()));
 			}