AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

Unregister the popover before destroying it

Browse Source 
Fixes a leak of the registered_windows list in GtkWidget.

https://bugzilla.gnome.org/show_bug.cgi?id=554618
This commit is contained in:
William Jon McCann 2014-02-21 13:43:55 -05:00
parent ca4910cd79
commit c287845240
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkwindow.c
View File

@ -1338,8 +1338,18 @@ popover_destroy (GtkWindowPopover *popover)
popover->unmap_id = 0;
}
if (popover->widget && gtk_widget_get_parent (popover->widget))
gtk_widget_unparent (popover->widget);
if (popover->widget)
{
GtkWidget *parent;
parent = gtk_widget_get_parent (popover->widget);
if (parent)
{
gtk_widget_unregister_window (parent, popover->window);
gtk_widget_unparent (popover->widget);
}
}
if (popover->window)
gdk_window_destroy (popover->window);
@ -6252,8 +6262,10 @@ gtk_window_realize (GtkWidget *widget)
static void
popover_unrealize (GtkWidget *widget,
GtkWindowPopover *popover)
GtkWindowPopover *popover,
GtkWindow *window)
{
gtk_widget_unregister_window (GTK_WIDGET (window), popover->window);
gtk_widget_unrealize (popover->widget);
gdk_window_destroy (popover->window);
popover->window = NULL;
@ -6316,7 +6328,7 @@ gtk_window_unrealize (GtkWidget *widget)
{
GtkWindowPopover *popover = link->data;
link = link->next;
popover_unrealize (popover->widget, popover);
popover_unrealize (popover->widget, popover, window);
}
GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize (widget);