Author: mkestner
Date: 2007-09-11 16:13:14 -0400 (Tue, 11 Sep 2007)
New Revision: 85657

Modified:
   trunk/gtk-sharp/ChangeLog
   trunk/gtk-sharp/gtk/Object.custom
Log:

2007-09-11  Mike Kestner  <[EMAIL PROTECTED]>
  
        * gtk/Object.custom (Destroy): add a null check to avoid 
        Gtk criticals.  The destroy case seems to be problematic with
        a bunch of existing code, so this turns it into a noop.


Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog   2007-09-11 20:01:01 UTC (rev 85656)
+++ trunk/gtk-sharp/ChangeLog   2007-09-11 20:13:14 UTC (rev 85657)
@@ -1,3 +1,9 @@
+2007-09-11  Mike Kestner  <[EMAIL PROTECTED]>
+  
+       * gtk/Object.custom (Destroy): add a null check to avoid 
+       Gtk criticals.  The destroy case seems to be problematic with
+       a bunch of existing code, so this turns it into a noop.
+
 2007-09-06  Mike Kestner  <[EMAIL PROTECTED]>
   
        * AssemblyInfo.cs.in : add IgnoreClassInitializers attr to all.

Modified: trunk/gtk-sharp/gtk/Object.custom
===================================================================
--- trunk/gtk-sharp/gtk/Object.custom   2007-09-11 20:01:01 UTC (rev 85656)
+++ trunk/gtk-sharp/gtk/Object.custom   2007-09-11 20:13:14 UTC (rev 85657)
@@ -123,7 +123,8 @@
 
                public virtual void Destroy ()
                {
-                       gtk_object_destroy (Handle);
+                       if (Handle != IntPtr.Zero)
+                               gtk_object_destroy (Handle);
                }
 
                [DllImport("gtksharpglue-2")]

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to