summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-06-05 19:35:12 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-06-05 20:00:43 -0400
commitca43f6ee28b7d83a92628c2562d078c0188decc2 (patch)
tree7796ec14de482dc9a8bacf8c514a879862a47ff2
parenteff09fabfad0b46b985b3af21e9c1e1d875c1a90 (diff)
downloadgtk+-ca43f6ee28b7d83a92628c2562d078c0188decc2.tar.gz
notebook: Free gadgets in finalize
This is the right place for this.
-rw-r--r--gtk/gtknotebook.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 259b79acb0..77a8a8b6a1 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -353,6 +353,7 @@ static void gtk_notebook_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
+static void gtk_notebook_finalize (GObject *object);
/*** GtkWidget Methods ***/
static void gtk_notebook_destroy (GtkWidget *widget);
@@ -703,6 +704,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
gobject_class->set_property = gtk_notebook_set_property;
gobject_class->get_property = gtk_notebook_get_property;
+ gobject_class->finalize = gtk_notebook_finalize;
widget_class->destroy = gtk_notebook_destroy;
widget_class->map = gtk_notebook_map;
@@ -1830,11 +1832,20 @@ gtk_notebook_destroy (GtkWidget *widget)
remove_switch_tab_timer (notebook);
GTK_WIDGET_CLASS (gtk_notebook_parent_class)->destroy (widget);
+}
+
+static void
+gtk_notebook_finalize (GObject *object)
+{
+ GtkNotebook *notebook = GTK_NOTEBOOK (object);
+ GtkNotebookPrivate *priv = notebook->priv;
g_clear_object (&priv->gadget);
g_clear_object (&priv->header_gadget);
g_clear_object (&priv->tabs_gadget);
g_clear_object (&priv->stack_gadget);
+
+ G_OBJECT_CLASS (gtk_notebook_parent_class)->finalize (object);
}
static void