vala r965 - in trunk: . gobject vala

[juergbi svn gnome org]

Author: juergbi
Date: Mon Feb  4 22:47:22 2008
New Revision: 965
URL: http://svn.gnome.org/viewvc/vala?rev=965&view=rev

Log:
2008-02-04  Juerg Billeter  <j bitron ch>

	* vala/valadatatype.vala, vala/valadelegatetype.vala,
	  gobject/valaccodeassignmentbinding.vala: don't crash when using
	  delegate properties, fixes bug 514261


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodeassignmentbinding.vala
   trunk/vala/valadatatype.vala
   trunk/vala/valadelegatetype.vala

Modified: trunk/gobject/valaccodeassignmentbinding.vala
==============================================================================
--- trunk/gobject/valaccodeassignmentbinding.vala	(original)
+++ trunk/gobject/valaccodeassignmentbinding.vala	Mon Feb  4 22:47:22 2008
@@ -53,7 +53,7 @@
 			// initialize GValue in array for current parameter
 			var cvalueinit = new CCodeFunctionCall (new CCodeIdentifier ("g_value_init"));
 			cvalueinit.add_argument (gvaluearg);
-			cvalueinit.add_argument (new CCodeIdentifier (prop.type_reference.data_type.get_type_id ()));
+			cvalueinit.add_argument (new CCodeIdentifier (prop.type_reference.get_type_id ()));
 			ccomma.append_expression (cvalueinit);
 			
 			// set GValue for current parameter

Modified: trunk/vala/valadatatype.vala
==============================================================================
--- trunk/vala/valadatatype.vala	(original)
+++ trunk/vala/valadatatype.vala	Mon Feb  4 22:47:22 2008
@@ -471,4 +471,12 @@
 		}
 		return false;
 	}
+
+	public virtual string? get_type_id () {
+		if (data_type != null) {
+			return data_type.get_type_id ();
+		} else {
+			return null;
+		}
+	}
 }

Modified: trunk/vala/valadelegatetype.vala
==============================================================================
--- trunk/vala/valadelegatetype.vala	(original)
+++ trunk/vala/valadelegatetype.vala	Mon Feb  4 22:47:22 2008
@@ -61,4 +61,8 @@
 		symbols.add (delegate_symbol);
 		return symbols;
 	}
+
+	public override string? get_type_id () {
+		return "G_TYPE_POINTER";
+	}
 }