Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect against X errors when clearing the DND cache

Browse Source 
This was reported as a problem in bug 609952.
(cherry picked from commit 325cbef27e)
This commit is contained in:
Matthias Clasen
2010-02-23 12:32:36 -05:00
parent 4623a485c7
commit d3374dbc00
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,15 +569,21 @@ static void
gdk_window_cache_destroy (GdkWindowCache *cache)
{
GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
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);
g_list_foreach (cache->children, (GFunc)free_cache_child,
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);