From f53935b65d852b6d08f579dcbff8247078fd68bb Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 17 Jan 2008 14:37:02 +0000 Subject: [PATCH] 2008-01-17 Mike Kestner * generator/Property.cs: missing Parent null check needed for direct GLib.Object subclasses. Suggested by mario@gnome.cl. [Fixes #321536] svn path=/trunk/gtk-sharp/; revision=93151 --- ChangeLog | 5 +++++ generator/Property.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d240cf87b..3bf009dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-17 Mike Kestner + + * generator/Property.cs: missing Parent null check needed for direct + GLib.Object subclasses. Suggested by mario@gnome.cl. [Fixes #321536] + 2008-01-17 Mike Kestner * sample/Assistant.cs: new Gtk.Assistant sample. diff --git a/generator/Property.cs b/generator/Property.cs index f7d540b47..8a16d1667 100644 --- a/generator/Property.cs +++ b/generator/Property.cs @@ -105,7 +105,7 @@ namespace GtkSharp.Generation { if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null)) modifiers = "new "; - else if (implementor != null && implementor.Parent.GetPropertyRecursively (Name) != null) + else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null) modifiers = "new "; string name = Name;