[gimp/soc-2010-cage] app: drop all object references in dispose() insatead of finalize()
- From: Michael Muré <mmure src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2010-cage] app: drop all object references in dispose() insatead of finalize()
- Date: Wed, 30 Jun 2010 22:15:21 +0000 (UTC)
commit 800d7c08f73a11702ab1cec2673b4607fbcfac34
Author: Michael Natterer <mitch gimp org>
Date: Thu Jun 24 12:57:46 2010 +0200
app: drop all object references in dispose() insatead of finalize()
app/core/gimpcontext.c | 133 ++++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 61 deletions(-)
---
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index cc23e4a..ebfd984 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -901,6 +901,78 @@ gimp_context_dispose (GObject *object)
context->gimp = NULL;
}
+ if (context->tool_info)
+ {
+ g_object_unref (context->tool_info);
+ context->tool_info = NULL;
+ }
+
+ if (context->paint_info)
+ {
+ g_object_unref (context->paint_info);
+ context->paint_info = NULL;
+ }
+
+ if (context->brush)
+ {
+ g_object_unref (context->brush);
+ context->brush = NULL;
+ }
+
+ if (context->dynamics)
+ {
+ g_object_unref (context->dynamics);
+ context->dynamics = NULL;
+ }
+
+ if (context->pattern)
+ {
+ g_object_unref (context->pattern);
+ context->pattern = NULL;
+ }
+
+ if (context->gradient)
+ {
+ g_object_unref (context->gradient);
+ context->gradient = NULL;
+ }
+
+ if (context->palette)
+ {
+ g_object_unref (context->palette);
+ context->palette = NULL;
+ }
+
+ if (context->tool_preset)
+ {
+ g_object_unref (context->tool_preset);
+ context->tool_preset = NULL;
+ }
+
+ if (context->font)
+ {
+ g_object_unref (context->font);
+ context->font = NULL;
+ }
+
+ if (context->buffer)
+ {
+ g_object_unref (context->buffer);
+ context->buffer = NULL;
+ }
+
+ if (context->imagefile)
+ {
+ g_object_unref (context->imagefile);
+ context->imagefile = NULL;
+ }
+
+ if (context->template)
+ {
+ g_object_unref (context->template);
+ context->template = NULL;
+ }
+
G_OBJECT_CLASS (parent_class)->dispose (object);
}
@@ -913,132 +985,72 @@ gimp_context_finalize (GObject *object)
context->image = NULL;
context->display = NULL;
- if (context->tool_info)
- {
- g_object_unref (context->tool_info);
- context->tool_info = NULL;
- }
if (context->tool_name)
{
g_free (context->tool_name);
context->tool_name = NULL;
}
- if (context->paint_info)
- {
- g_object_unref (context->paint_info);
- context->paint_info = NULL;
- }
if (context->paint_name)
{
g_free (context->paint_name);
context->paint_name = NULL;
}
- if (context->brush)
- {
- g_object_unref (context->brush);
- context->brush = NULL;
- }
if (context->brush_name)
{
g_free (context->brush_name);
context->brush_name = NULL;
}
- if (context->dynamics)
- {
- g_object_unref (context->dynamics);
- context->dynamics = NULL;
- }
if (context->dynamics_name)
{
g_free (context->dynamics_name);
context->dynamics_name = NULL;
}
- if (context->pattern)
- {
- g_object_unref (context->pattern);
- context->pattern = NULL;
- }
if (context->pattern_name)
{
g_free (context->pattern_name);
context->pattern_name = NULL;
}
- if (context->gradient)
- {
- g_object_unref (context->gradient);
- context->gradient = NULL;
- }
if (context->gradient_name)
{
g_free (context->gradient_name);
context->gradient_name = NULL;
}
- if (context->palette)
- {
- g_object_unref (context->palette);
- context->palette = NULL;
- }
if (context->palette_name)
{
g_free (context->palette_name);
context->palette_name = NULL;
}
- if (context->tool_preset)
- {
- g_object_unref (context->tool_preset);
- context->tool_preset = NULL;
- }
if (context->tool_preset_name)
{
g_free (context->tool_preset_name);
context->tool_preset_name = NULL;
}
- if (context->font)
- {
- g_object_unref (context->font);
- context->font = NULL;
- }
if (context->font_name)
{
g_free (context->font_name);
context->font_name = NULL;
}
- if (context->buffer)
- {
- g_object_unref (context->buffer);
- context->buffer = NULL;
- }
if (context->buffer_name)
{
g_free (context->buffer_name);
context->buffer_name = NULL;
}
- if (context->imagefile)
- {
- g_object_unref (context->imagefile);
- context->imagefile = NULL;
- }
if (context->imagefile_name)
{
g_free (context->imagefile_name);
context->imagefile_name = NULL;
}
- if (context->template)
- {
- g_object_unref (context->template);
- context->template = NULL;
- }
if (context->template_name)
{
g_free (context->template_name);
@@ -1346,7 +1358,6 @@ gimp_context_deserialize_property (GimpConfig *object,
name_loc = &context->tool_preset_name;
break;
-
case GIMP_CONTEXT_PROP_FONT:
container = context->gimp->fonts;
current = (GimpObject *) context->font;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]