From 26afefa1802cd4440bd816843078b2210ba6d675 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Mon, 4 Aug 2008 20:06:31 +0000 Subject: [PATCH] Fix crash on incremental parsing, patch by Abderrahim Kitouni MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-04 Jürg Billeter * vala/valatypesymbol.vala: Fix crash on incremental parsing, patch by Abderrahim Kitouni svn path=/trunk/; revision=1732 --- ChangeLog | 6 ++++++ THANKS | 1 + vala/valatypesymbol.vala | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea24f40..166e54d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-08-04 Jürg Billeter + * vala/valatypesymbol.vala: + + Fix crash on incremental parsing, patch by Abderrahim Kitouni + +2008-08-04 Jürg Billeter + * vapi/glib-2.0.vapi: Fix g_object_get and g_object_set bindings diff --git a/THANKS b/THANKS index 450afa9..4dc6fc4 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 fdbc9c8..00725b8 100644 --- a/vala/valatypesymbol.vala +++ b/vala/valatypesymbol.vala @@ -192,7 +192,8 @@ public abstract class Vala.TypeSymbol : Symbol { } public override Gee.List 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); -- 2.7.4