vala r1506 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Sat May 31 08:00:32 2008
New Revision: 1506
URL: http://svn.gnome.org/viewvc/vala?rev=1506&view=rev

Log:
2008-05-31  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodedynamicsignalbinding.vala:

	Fix dynamic signals for D-Bus objects


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

Modified: trunk/gobject/valaccodedynamicsignalbinding.vala
==============================================================================
--- trunk/gobject/valaccodedynamicsignalbinding.vala	(original)
+++ trunk/gobject/valaccodedynamicsignalbinding.vala	Sat May 31 08:00:32 2008
@@ -59,11 +59,11 @@
 			func.add_parameter (new CCodeFormalParameter ("handler", "GCallback"));
 			func.add_parameter (new CCodeFormalParameter ("data", "gpointer"));
 			var block = new CCodeBlock ();
-			if (dynamic_signal.dynamic_type.data_type != null
-			    && dynamic_signal.dynamic_type.data_type.is_subtype_of (codegen.gobject_type)) {
-				generate_gobject_connect_wrapper (block);
-			} else if (dynamic_signal.dynamic_type.data_type == codegen.dbus_object_type) {
+			if (dynamic_signal.dynamic_type.data_type == codegen.dbus_object_type) {
 				generate_dbus_connect_wrapper (block);
+			} else if (dynamic_signal.dynamic_type.data_type != null
+			           && dynamic_signal.dynamic_type.data_type.is_subtype_of (codegen.gobject_type)) {
+				generate_gobject_connect_wrapper (block);
 			} else {
 				Report.error (node.source_reference, "dynamic signals are not supported for `%s'".printf (dynamic_signal.dynamic_type.to_string ()));
 			}