[gtk+/wip/matthiasc/gadget: 1/16] spinner: Don't leak the gadget
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/gadget: 1/16] spinner: Don't leak the gadget
- Date: Mon, 7 Dec 2015 16:06:58 +0000 (UTC)
commit b320a7d00ff0aa7ab51437e3cb4a6ac32dab8c8d
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Nov 26 20:50:25 2015 -0500
spinner: Don't leak the gadget
gtk/gtkspinner.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 0b0485c..d6d6bd3 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -71,10 +71,7 @@ struct _GtkSpinnerPrivate
gboolean active;
};
-static gboolean gtk_spinner_draw (GtkWidget *widget,
- cairo_t *cr);
-static void gtk_spinner_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
+static void gtk_spinner_finalize (GObject *object);
static void gtk_spinner_get_property (GObject *object,
guint param_id,
GValue *value,
@@ -83,14 +80,18 @@ static void gtk_spinner_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec);
-static void gtk_spinner_set_active (GtkSpinner *spinner,
- gboolean active);
+static gboolean gtk_spinner_draw (GtkWidget *widget,
+ cairo_t *cr);
+static void gtk_spinner_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static void gtk_spinner_get_preferred_width (GtkWidget *widget,
gint *minimum_size,
gint *natural_size);
static void gtk_spinner_get_preferred_height (GtkWidget *widget,
gint *minimum_size,
gint *natural_size);
+static void gtk_spinner_set_active (GtkSpinner *spinner,
+ gboolean active);
static void gtk_spinner_get_content_size (GtkCssGadget *gadget,
GtkOrientation orientation,
@@ -122,6 +123,7 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
GtkWidgetClass *widget_class;
gobject_class = G_OBJECT_CLASS(klass);
+ gobject_class->finalize = gtk_spinner_finalize;
gobject_class->get_property = gtk_spinner_get_property;
gobject_class->set_property = gtk_spinner_set_property;
@@ -205,6 +207,16 @@ gtk_spinner_init (GtkSpinner *spinner)
}
static void
+gtk_spinner_finalize (GObject *object)
+{
+ GtkSpinner *spinner = GTK_SPINNER (object);
+
+ g_clear_object (&spinner->priv->gadget);
+
+ G_OBJECT_CLASS (gtk_spinner_parent_class)->finalize (object);
+}
+
+static void
gtk_spinner_get_content_size (GtkCssGadget *gadget,
GtkOrientation orientation,
gint for_size,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]