vala r1856 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Oct 17 14:45:24 2008
New Revision: 1856
URL: http://svn.gnome.org/viewvc/vala?rev=1856&view=rev

Log:
2008-10-17  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala:

	Use defines also for internal constants to fix string constant
	concatenation


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

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Fri Oct 17 14:45:24 2008
@@ -506,9 +506,13 @@
 	public override void visit_constant (Constant c) {
 		c.accept_children (this);
 
-		if (!c.is_internal_symbol () && !(c.type_reference is ArrayType)) {
+		if (!(c.type_reference is ArrayType)) {
 			var cdefine = new CCodeMacroReplacement.with_expression (c.get_cname (), (CCodeExpression) c.initializer.ccodenode);
-			header_type_member_declaration.append (cdefine);
+			if (!c.is_internal_symbol ()) {
+				header_type_member_declaration.append (cdefine);
+			} else {
+				source_type_member_declaration.append (cdefine);
+			}
 		} else {
 			var cdecl = new CCodeDeclaration (c.type_reference.get_const_cname ());
 			var arr = "";