summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2008-08-04 20:06:31 +0000
committerJürg Billeter <juergbi@src.gnome.org>2008-08-04 20:06:31 +0000
commit26afefa1802cd4440bd816843078b2210ba6d675 (patch)
treedf35a4d6fdb7a224ab6222db210923aab0cf8ce5
parentabbf03306e9c80faec9aa4bf4611aee4b40fe13f (diff)
downloadvala-26afefa1802cd4440bd816843078b2210ba6d675.tar.gz
Fix crash on incremental parsing, patch by Abderrahim Kitouni
2008-08-04 Jürg Billeter <j@bitron.ch> * vala/valatypesymbol.vala: Fix crash on incremental parsing, patch by Abderrahim Kitouni svn path=/trunk/; revision=1732
-rw-r--r--ChangeLog6
-rw-r--r--THANKS1
-rw-r--r--vala/valatypesymbol.vala3
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea24f4083..166e54d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-04 Jürg Billeter <j@bitron.ch>
+ * vala/valatypesymbol.vala:
+
+ Fix crash on incremental parsing, patch by Abderrahim Kitouni
+
+2008-08-04 Jürg Billeter <j@bitron.ch>
+
* vapi/glib-2.0.vapi:
Fix g_object_get and g_object_set bindings
diff --git a/THANKS b/THANKS
index 450afa99e..4dc6fc436 100644
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,6 @@
The Vala team would like to thank the following contributors:
+Abderrahim Kitouni
Alberto Ruiz
Alexandre Moreira
Ali Sabil
diff --git a/vala/valatypesymbol.vala b/vala/valatypesymbol.vala
index fdbc9c850..00725b893 100644
--- a/vala/valatypesymbol.vala
+++ b/vala/valatypesymbol.vala
@@ -192,7 +192,8 @@ public abstract class Vala.TypeSymbol : Symbol {
}
public override Gee.List<string> get_cheader_filenames () {
- if (cheader_filenames.size == 0) {
+ // parent_symbol can be null on incremental parsing
+ if (cheader_filenames.size == 0 && parent_symbol != null) {
/* default to header filenames of the namespace */
foreach (string filename in parent_symbol.get_cheader_filenames ()) {
add_cheader_filename (filename);