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

Merge branch 'wip/exalm/controls-dispose' into 'master'

Browse Source 
windowcontrols: Unparent children in dispose rather than finalize

See merge request GNOME/gtk!1831
This commit is contained in:
Matthias Clasen 2020-05-05 18:19:00 +00:00
commit d2b55dff2d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkwindowcontrols.c
View File

@ -411,12 +411,20 @@ gtk_window_controls_unroot (GtkWidget *widget)
}
static void
gtk_window_controls_finalize (GObject *object)
gtk_window_controls_dispose (GObject *object)
{
GtkWindowControls *self = GTK_WINDOW_CONTROLS (object);
clear_controls (self);
G_OBJECT_CLASS (gtk_window_controls_parent_class)->dispose (object);
}
static void
gtk_window_controls_finalize (GObject *object)
{
GtkWindowControls *self = GTK_WINDOW_CONTROLS (object);
g_free (self->decoration_layout);
G_OBJECT_CLASS (gtk_window_controls_parent_class)->finalize (object);
@ -480,6 +488,7 @@ gtk_window_controls_class_init (GtkWindowControlsClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->dispose = gtk_window_controls_dispose;
object_class->finalize = gtk_window_controls_finalize;
object_class->get_property = gtk_window_controls_get_property;
object_class->set_property = gtk_window_controls_set_property;