AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GdkX11dnd: Fix build issue

Browse Source 
I messed up while rebasing the window caches patch.
This commit is contained in:
Adel Gadllah 2011-01-05 17:54:29 +01:00
parent 644f25c497
commit 6490a22aaf
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gdk/x11/gdkdnd-x11.c
View File

@ -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,