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

GDK W32: Deduplicate reparenting

Browse Source 
gdk_window_reparent() already changes children list for old and new parent.
Doing so twice results in a circular reference in the list, which can hang
the application later, for example in gtk_window_show().

https://bugzilla.gnome.org/show_bug.cgi?id=764845
This commit is contained in:
Руслан Ижбулатов 2016-04-11 07:07:14 +00:00
parent c8d1108574
commit c2aa7d0749
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/win32/gdkwindow-win32.c
View File

@ -1662,8 +1662,6 @@ gdk_win32_window_reparent (GdkWindow *window,
gint y)
{
GdkScreen *screen;
GdkWindow *parent;
GdkWindow *old_parent;
GdkWindowImplWin32 *impl;
gboolean new_parent_is_root;
gboolean was_toplevel;
@ -1679,8 +1677,6 @@ gdk_win32_window_reparent (GdkWindow *window,
else
new_parent_is_root = (gdk_screen_get_root_window (screen) == new_parent);
old_parent = window->parent;
parent = new_parent;
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
GDK_NOTE (MISC, g_print ("gdk_win32_window_reparent: %p: %p\n",
@ -1745,11 +1741,6 @@ gdk_win32_window_reparent (GdkWindow *window,
}
}
if (old_parent)
old_parent->children = g_list_remove_link (old_parent->children, &window->children_list_node);
parent->children = g_list_concat (&window->children_list_node, parent->children);
return FALSE;
}