gimp r27787 - in trunk: . app/core
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27787 - in trunk: . app/core
- Date: Sat, 13 Dec 2008 17:27:51 +0000 (UTC)
Author: martinn
Date: Sat Dec 13 17:27:50 2008
New Revision: 27787
URL: http://svn.gnome.org/viewvc/gimp?rev=27787&view=rev
Log:
* app/core/gimp.c: We shall unref in dispose() and free in
finalize(), not vice versa.
Modified:
trunk/ChangeLog
trunk/app/core/gimp.c
Modified: trunk/app/core/gimp.c
==============================================================================
--- trunk/app/core/gimp.c (original)
+++ trunk/app/core/gimp.c Sat Dec 13 17:27:50 2008
@@ -272,29 +272,6 @@
if (gimp->be_verbose)
g_print ("EXIT: %s\n", G_STRFUNC);
- if (gimp->brush_factory)
- gimp_data_factory_data_free (gimp->brush_factory);
-
- if (gimp->pattern_factory)
- gimp_data_factory_data_free (gimp->pattern_factory);
-
- if (gimp->gradient_factory)
- gimp_data_factory_data_free (gimp->gradient_factory);
-
- if (gimp->palette_factory)
- gimp_data_factory_data_free (gimp->palette_factory);
-
- G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-gimp_finalize (GObject *object)
-{
- Gimp *gimp = GIMP (object);
-
- if (gimp->be_verbose)
- g_print ("EXIT: %s\n", G_STRFUNC);
-
gimp_contexts_exit (gimp);
if (gimp->image_new_last_template)
@@ -432,6 +409,29 @@
gimp->context_list = NULL;
}
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_finalize (GObject *object)
+{
+ Gimp *gimp = GIMP (object);
+
+ if (gimp->be_verbose)
+ g_print ("EXIT: %s\n", G_STRFUNC);
+
+ if (gimp->brush_factory)
+ gimp_data_factory_data_free (gimp->brush_factory);
+
+ if (gimp->pattern_factory)
+ gimp_data_factory_data_free (gimp->pattern_factory);
+
+ if (gimp->gradient_factory)
+ gimp_data_factory_data_free (gimp->gradient_factory);
+
+ if (gimp->palette_factory)
+ gimp_data_factory_data_free (gimp->palette_factory);
+
gimp_units_exit (gimp);
G_OBJECT_CLASS (parent_class)->finalize (object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]