summaryrefslogtreecommitdiff
path: root/vala
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2010-03-09 17:27:50 +0100
committerJürg Billeter <j@bitron.ch>2010-03-09 17:27:50 +0100
commitcd884c539d4e2ab24805a2ab562c22c07f708189 (patch)
tree9bdb30f2e253645116e62e8c20b7ddd7fb74590e /vala
parent3f158af25a29646c5d5feffa0136bcba8b966a53 (diff)
downloadvala-cd884c539d4e2ab24805a2ab562c22c07f708189.tar.gz
Use correct marshaller for fundamental classes
Fixes bug 611845.
Diffstat (limited to 'vala')
-rw-r--r--vala/valaclass.vala4
1 files changed, 3 insertions, 1 deletions
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";
}