Author: mkestner
Date: 2008-01-17 09:42:59 -0500 (Thu, 17 Jan 2008)
New Revision: 93152
Modified:
branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
branches/gtk-sharp-2-468-branch/gtk-sharp/generator/Property.cs
Log:
2008-01-17 Mike Kestner <[EMAIL PROTECTED]>
* generator/Property.cs: missing Parent null check needed for direct
GLib.Object subclasses. Suggested by [EMAIL PROTECTED] [Fixes #321536]
Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2008-01-17 14:37:02 UTC
(rev 93151)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2008-01-17 14:42:59 UTC
(rev 93152)
@@ -1,3 +1,8 @@
+2008-01-17 Mike Kestner <[EMAIL PROTECTED]>
+
+ * generator/Property.cs: missing Parent null check needed for direct
+ GLib.Object subclasses. Suggested by [EMAIL PROTECTED] [Fixes #321536]
+
2007-12-07 Wade Berrier <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am: Copy AssemblyInfo.cs to the current dir so
Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/generator/Property.cs
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/generator/Property.cs
2008-01-17 14:37:02 UTC (rev 93151)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/generator/Property.cs
2008-01-17 14:42:59 UTC (rev 93152)
@@ -105,7 +105,7 @@
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;
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
