[gimp] app: unref the paint options in dispose() instead of finalize()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: unref the paint options in dispose() instead of finalize()
- Date: Thu, 24 Jun 2010 16:40:14 +0000 (UTC)
commit bfbdf1cfb88869959984a16cb7e6e8cd686596ce
Author: Michael Natterer <mitch gimp org>
Date: Thu Jun 24 12:58:22 2010 +0200
app: unref the paint options in dispose() instead of finalize()
app/core/gimppaintinfo.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/app/core/gimppaintinfo.c b/app/core/gimppaintinfo.c
index 28c8475..757a1f3 100644
--- a/app/core/gimppaintinfo.c
+++ b/app/core/gimppaintinfo.c
@@ -27,6 +27,7 @@
#include "gimppaintinfo.h"
+static void gimp_paint_info_dispose (GObject *object);
static void gimp_paint_info_finalize (GObject *object);
static gchar * gimp_paint_info_get_description (GimpViewable *viewable,
gchar **tooltip);
@@ -43,6 +44,7 @@ gimp_paint_info_class_init (GimpPaintInfoClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+ object_class->dispose = gimp_paint_info_dispose;
object_class->finalize = gimp_paint_info_finalize;
viewable_class->get_description = gimp_paint_info_get_description;
@@ -58,6 +60,20 @@ gimp_paint_info_init (GimpPaintInfo *paint_info)
}
static void
+gimp_paint_info_dispose (GObject *object)
+{
+ GimpPaintInfo *paint_info = GIMP_PAINT_INFO (object);
+
+ if (paint_info->paint_options)
+ {
+ g_object_unref (paint_info->paint_options);
+ paint_info->paint_options = NULL;
+ }
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
gimp_paint_info_finalize (GObject *object)
{
GimpPaintInfo *paint_info = GIMP_PAINT_INFO (object);
@@ -68,12 +84,6 @@ gimp_paint_info_finalize (GObject *object)
paint_info->blurb = NULL;
}
- if (paint_info->paint_options)
- {
- g_object_unref (paint_info->paint_options);
- paint_info->paint_options = NULL;
- }
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]