banshee r4243 - in trunk/banshee: . src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView src/Libraries/Hyena.Gui/Hyena.Gui

[abock svn gnome org]

Author: abock
Date: Thu Jul 24 17:26:49 2008
New Revision: 4243
URL: http://svn.gnome.org/viewvc/banshee?rev=4243&view=rev

Log:
2008-07-24  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs: Work around a nasty
    little bug in GDK and subsequently Gdk# (2.8.5 through 2.12.1) where
    managed Gdk.Window.Destroy function does not obtain a normal (non-toggle)
    reference on the GdkWindow before calling gdk_window_destroy on it,
    which the native function apparently expects. This work around ensures
    that GdkWindows will be properly destroyed regardless of the Gdk#
    version in use

    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs:
    Use GtkWorkarounds.WindowDestroy



Added:
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs	Thu Jul 24 17:26:49 2008
@@ -89,7 +89,7 @@
             WidgetFlags &= ~WidgetFlags.Realized;
             
             event_window.UserData = IntPtr.Zero;
-            event_window.Destroy ();
+            Hyena.Gui.GtkWorkarounds.WindowDestroy (event_window);
             event_window = null;
             
             base.OnUnrealized ();

Added: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs	Thu Jul 24 17:26:49 2008
@@ -0,0 +1,92 @@
+//
+// GtkWorkarounds.cs
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+
+namespace Hyena.Gui
+{
+    public static class GtkWorkarounds
+    {
+        private static bool toggle_ref_supported;
+        private static MethodInfo g_object_ref;
+        private static MethodInfo gdk_window_destroy;
+        private static object [] invoke_args;
+    
+        static GtkWorkarounds ()
+        {
+            if (!(toggle_ref_supported = Assembly.GetAssembly (typeof (GLib.Object)).GetType (
+                "GLib.ToggleRef") != null)) {
+                return;
+            }
+            
+            // Find the P/Invoke signatures we need so we can avoid a dllmap
+            g_object_ref = typeof (GLib.Object).GetMethod ("g_object_ref", 
+                BindingFlags.NonPublic | BindingFlags.Static);
+            
+            gdk_window_destroy = typeof (Gdk.Window).GetMethod ("gdk_window_destroy", 
+                BindingFlags.NonPublic | BindingFlags.Static);
+        }
+        
+        public static void WindowDestroy (Gdk.Window window)
+        {
+            // There is a bug in GDK, and subsequently in Gdk# 2.8.5 through 2.12.1
+            // where the managed Gdk.Window.Destroy function does not obtain a
+            // normal reference (non-toggle) on the GdkWindow before calling 
+            // _destroy on it, which the native function apparently expects.
+            
+            // https://bugzilla.novell.com/show_bug.cgi?id=382186
+            // http://anonsvn.mono-project.com/viewcvs/trunk/gtk-sharp/gdk/Window.custom?rev=101734&r1=42529&r2=101734
+        
+            if (window == null) {
+                return;
+            } 
+            
+            if (!toggle_ref_supported) {
+                window.Destroy ();
+                return;
+            }
+            
+            // If this ever happens I will move out west and start farming...
+            if (g_object_ref == null || gdk_window_destroy == null) {
+                window.Destroy ();
+                return;
+            }
+            
+            if (invoke_args == null) {
+                invoke_args = new object[1];
+            }
+            
+            invoke_args[0] = window.Handle;
+            g_object_ref.Invoke (null, invoke_args);
+            gdk_window_destroy.Invoke (null, invoke_args);
+            
+            window.Dispose ();
+        }
+    }
+}