From: Juerg Billeter <j@bitron.ch>
Date: Sun, 6 Apr 2008 19:43:53 +0000 (+0000)
Subject: fix crash when using pointers in parameters of D-Bus signals, fixes bug
X-Git-Tag: VALA_0_2_0~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93fb936bce953aed23b6f0fb487089942a94c5b0;p=platform%2Fupstream%2Fvala.git

fix crash when using pointers in parameters of D-Bus signals, fixes bug

2008-04-06  Juerg Billeter  <j@bitron.ch>

	* vala/valapointertype.vala,
	  gobject/valaccodeassignmentbinding.vala: fix crash when using
	  pointers in parameters of D-Bus signals, fixes bug 526111

svn path=/trunk/; revision=1168
---

diff --git a/ChangeLog b/ChangeLog
index 8c3b47f..0a8ed2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-04-06  Jürg Billeter  <j@bitron.ch>
 
+	* vala/valapointertype.vala,
+	  gobject/valaccodeassignmentbinding.vala: fix crash when using
+	  pointers in parameters of D-Bus signals, fixes bug 526111
+
+2008-04-06  Jürg Billeter  <j@bitron.ch>
+
 	* gobject/valaccodegeneratorinvocationexpression.vala: fix crash
 	  when using string arrays in parameters of D-Bus methods,
 	  fixes bug 525166
diff --git a/gobject/valaccodeassignmentbinding.vala b/gobject/valaccodeassignmentbinding.vala
index 9553196..d1d74ae 100644
--- a/gobject/valaccodeassignmentbinding.vala
+++ b/gobject/valaccodeassignmentbinding.vala
@@ -287,8 +287,8 @@ public class Vala.CCodeAssignmentBinding : CCodeExpressionBinding {
 					register_call.add_argument (carray_type);
 					add_call.add_argument (carray_type);
 				} else {
-					register_call.add_argument (new CCodeIdentifier (param.type_reference.data_type.get_type_id ()));
-					add_call.add_argument (new CCodeIdentifier (param.type_reference.data_type.get_type_id ()));
+					register_call.add_argument (new CCodeIdentifier (param.type_reference.get_type_id ()));
+					add_call.add_argument (new CCodeIdentifier (param.type_reference.get_type_id ()));
 				}
 			}
 			register_call.add_argument (new CCodeIdentifier ("G_TYPE_INVALID"));
diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index 5ac92ba..a1366b4 100644
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -82,4 +82,8 @@ public class Vala.PointerType : DataType {
 	public override Collection<Symbol> get_symbols () {
 		return base_type.get_symbols ();
 	}
+
+	public override string? get_type_id () {
+		return "G_TYPE_POINTER";
+	}
 }