From: Jürg Billeter <j@bitron.ch>
Date: Wed, 9 May 2007 09:41:36 +0000 (+0000)
Subject: don't add default include directives for VAPI files, fixes bug 436761
X-Git-Tag: VALA_0_1_0~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=899d284af4589cd977cb377d0ade2a1129d8a274;p=thirdparty%2Fvala.git

don't add default include directives for VAPI files, fixes bug 436761

2007-05-09  Jürg Billeter  <j@bitron.ch>

	* vala/valanamespace.vala: don't add default include directives for
	  VAPI files, fixes bug 436761

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

diff --git a/ChangeLog b/ChangeLog
index fd469a417..c1d8c93d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-09  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valanamespace.vala: don't add default include directives for
+	  VAPI files, fixes bug 436761
+
 2007-05-07  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/glib-2.0.vala: correct strstr cname, patch by Zsombor
diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index 3b63cba42..a8843c7ad 100644
--- a/vala/valanamespace.vala
+++ b/vala/valanamespace.vala
@@ -316,7 +316,10 @@ public class Vala.Namespace : CodeNode {
 	 */
 	public ref List<weak string> get_cheader_filenames () {
 		if (cheader_filenames == null) {
-			cheader_filenames.append (source_reference.file.get_cinclude_filename ());
+			if (!source_reference.file.pkg) {
+				// don't add default include directives for VAPI files
+				cheader_filenames.append (source_reference.file.get_cinclude_filename ());
+			}
 		}
 		return cheader_filenames.copy ();
 	}