[gtk+/gtk-2-24] GdkX11dnd: Fix build issue



commit 6490a22aaf39f7c9736d78cf4d0b7b633e03d5fd
Author: Adel Gadllah <adel gadllah gmail com>
Date:   Wed Jan 5 17:54:29 2011 +0100

    GdkX11dnd: Fix build issue
    
    I messed up while rebasing the window caches patch.

 gdk/x11/gdkdnd-x11.c |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 90d85a9..6782896 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -596,6 +596,31 @@ gdk_window_cache_new (GdkScreen *screen)
   return result;
 }
 
+static void
+gdk_window_cache_destroy (GdkWindowCache *cache)
+{
+  GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
+
+  XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
+		GDK_WINDOW_XWINDOW (root_window),
+		cache->old_event_mask);
+  gdk_window_remove_filter (root_window, gdk_window_cache_filter, cache);
+  gdk_window_remove_filter (NULL, gdk_window_cache_shape_filter, cache);
+
+  gdk_error_trap_push ();
+
+  g_list_foreach (cache->children, (GFunc)free_cache_child,
+      gdk_screen_get_display (cache->screen));
+
+  gdk_flush ();
+  gdk_error_trap_pop ();
+
+  g_list_free (cache->children);
+  g_hash_table_destroy (cache->child_hash);
+
+  g_free (cache);
+}
+
 static GdkWindowCache *
 gdk_window_cache_ref (GdkWindowCache *cache)
 {
@@ -639,31 +664,6 @@ gdk_window_cache_get (GdkScreen *screen)
 }
 
 
-static void
-gdk_window_cache_destroy (GdkWindowCache *cache)
-{
-  GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
-
-  XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
-		GDK_WINDOW_XWINDOW (root_window),
-		cache->old_event_mask);
-  gdk_window_remove_filter (root_window, gdk_window_cache_filter, cache);
-  gdk_window_remove_filter (NULL, gdk_window_cache_shape_filter, cache);
-
-  gdk_error_trap_push ();
-
-  g_list_foreach (cache->children, (GFunc)free_cache_child,
-      gdk_screen_get_display (cache->screen));
-
-  gdk_flush ();
-  gdk_error_trap_pop ();
-
-  g_list_free (cache->children);
-  g_hash_table_destroy (cache->child_hash);
-
-  g_free (cache);
-}
-
 static gboolean
 is_pointer_within_shape (GdkDisplay    *display,
                          GdkCacheChild *child,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]