callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkoverlay: Fix issues with remove

Browse Source 
The iteration now progresses past a delete, so make sure we iterate
safely. Also, don't chain up if we removed a child.
This commit is contained in:
Alexander Larsson
2015-06-15 16:32:50 +02:00
parent 5cf2896308
commit 9fc19b5a26
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkoverlay.c
View File

@ -497,13 +497,14 @@ gtk_overlay_remove (GtkContainer *container,
{ {
GtkOverlayPrivate *priv = GTK_OVERLAY (container)->priv; GtkOverlayPrivate *priv = GTK_OVERLAY (container)->priv;
GtkOverlayChild *child; GtkOverlayChild *child;
GSList *children; GSList *children, *next;
gboolean removed; gboolean removed;
removed = FALSE; removed = FALSE;
for (children = priv->children; children; children = children->next) for (children = priv->children; children; children = next)
{ {
child = children->data; child = children->data;
next = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
@ -524,7 +525,8 @@ gtk_overlay_remove (GtkContainer *container,
gtk_widget_child_notify (child->widget, "index"); gtk_widget_child_notify (child->widget, "index");
} }
GTK_CONTAINER_CLASS (gtk_overlay_parent_class)->remove (container, widget); if (!removed)
GTK_CONTAINER_CLASS (gtk_overlay_parent_class)->remove (container, widget);
} }
/** /**