From: Juerg Billeter <j@bitron.ch>
Date: Mon, 23 Jul 2007 14:11:02 +0000 (+0000)
Subject: fix some issues with memory management of includes lists
X-Git-Tag: VALA_0_1_2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=918761c664b3116a24873afee4211989dd3d53be;p=thirdparty%2Fvala.git

fix some issues with memory management of includes lists

2007-07-23  Juerg Billeter  <j@bitron.ch>

	* vala/valasourcefile.vala, gobject/valacodegeneratorsourcefile.vala:
	  fix some issues with memory management of includes lists

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

diff --git a/ChangeLog b/ChangeLog
index a27009db0..82f621e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valasourcefile.vala, gobject/valacodegeneratorsourcefile.vala:
+	  fix some issues with memory management of includes lists
+
 2007-07-23  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valainterface.vala, vala/valainterfacewriter.vala,
diff --git a/gobject/valacodegeneratorsourcefile.vala b/gobject/valacodegeneratorsourcefile.vala
index 19398aa2c..14b8cc1ed 100644
--- a/gobject/valacodegeneratorsourcefile.vala
+++ b/gobject/valacodegeneratorsourcefile.vala
@@ -50,7 +50,7 @@ public class Vala.CodeGenerator {
 		header_begin.append (new CCodeIncludeDirective ("glib-object.h"));
 		source_include_directives.append (new CCodeIncludeDirective (source_file.get_cheader_filename (), true));
 		
-		List<weak string> used_includes = null;
+		List<string> used_includes = null;
 		used_includes.append ("glib.h");
 		used_includes.append ("glib-object.h");
 		used_includes.append (source_file.get_cheader_filename ());
diff --git a/vala/valasourcefile.vala b/vala/valasourcefile.vala
index e65b4fee3..5f61d35a1 100644
--- a/vala/valasourcefile.vala
+++ b/vala/valasourcefile.vala
@@ -226,21 +226,29 @@ public class Vala.SourceFile {
 		
 		if (dep_type == SourceFileDependencyType.SOURCE) {
 			if (s.source_reference.file.pkg) {
-				source_external_includes.concat (s.get_cheader_filenames ());
+				foreach (string fn in s.get_cheader_filenames ()) {
+					source_external_includes.append (fn);
+				}
 			} else {
-				source_internal_includes.concat (s.get_cheader_filenames ());
+				foreach (string fn in s.get_cheader_filenames ()) {
+					source_internal_includes.append (fn);
+				}
 			}
 			return;
 		}
 
 		if (s.source_reference.file.pkg) {
 			/* external package */
-			header_external_includes.concat (s.get_cheader_filenames ());
+			foreach (string fn in s.get_cheader_filenames ()) {
+				header_external_includes.append (fn);
+			}
 			return;
 		}
 		
 		if (dep_type == SourceFileDependencyType.HEADER_FULL || (s is DataType && !((DataType)s).is_reference_type ())) {
-			header_internal_includes.concat (s.get_cheader_filenames ());
+			foreach (string fn in s.get_cheader_filenames ()) {
+				header_internal_includes.append (fn);
+			}
 			header_internal_full_dependencies.append (s.source_reference.file);
 		}