From: Jürg Billeter <j@bitron.ch>
Date: Tue, 9 Mar 2010 16:27:50 +0000 (+0100)
Subject: Use correct marshaller for fundamental classes
X-Git-Tag: 0.8.0~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd884c539d4e2ab24805a2ab562c22c07f708189;p=thirdparty%2Fvala.git

Use correct marshaller for fundamental classes

Fixes bug 611845.
---

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 18564b319..04342d0fb 100644
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -1,6 +1,6 @@
 /* valaclass.vala
  *
- * Copyright (C) 2006-2009  Jürg Billeter
+ * Copyright (C) 2006-2010  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -693,6 +693,8 @@ public class Vala.Class : ObjectTypeSymbol {
 		if (marshaller_type_name == null) {
 			if (base_class != null) {
 				marshaller_type_name = base_class.get_marshaller_type_name ();
+			} else if (!is_compact) {
+				marshaller_type_name = get_upper_case_cname ();
 			} else {
 				marshaller_type_name = "POINTER";
 			}