gimp r25976 - in branches/soc-2008-tagging: . app/core

[aurisj svn gnome org]

Author: aurisj
Date: Sun Jun 22 11:28:51 2008
New Revision: 25976
URL: http://svn.gnome.org/viewvc/gimp?rev=25976&view=rev

Log:
* app/core/gimp.c: save and uninitialize tag cache properly.


Modified:
   branches/soc-2008-tagging/ChangeLog
   branches/soc-2008-tagging/app/core/gimp.c

Modified: branches/soc-2008-tagging/app/core/gimp.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimp.c	(original)
+++ branches/soc-2008-tagging/app/core/gimp.c	Sun Jun 22 11:28:51 2008
@@ -263,10 +263,6 @@
   if (gimp->be_verbose)
     g_print ("EXIT: %s\n", G_STRFUNC);
 
-  /* cache must be saved before any tagged objects
-   * are destroyed. */
-  gimp_tag_cache_save (gimp->tag_cache);
-
   if (gimp->brush_factory)
     gimp_data_factory_data_free (gimp->brush_factory);
 
@@ -356,6 +352,12 @@
       gimp->fonts = NULL;
     }
 
+  if (gimp->tag_cache)
+    {
+      g_object_unref (gimp->tag_cache);
+      gimp->tag_cache = NULL;
+    }
+
   if (gimp->named_buffers)
     {
       g_object_unref (gimp->named_buffers);
@@ -647,6 +649,8 @@
   gimp_plug_in_manager_exit (gimp->plug_in_manager);
   gimp_modules_unload (gimp);
 
+  gimp_tag_cache_save (gimp->tag_cache);
+
   gimp_data_factory_data_save (gimp->brush_factory);
   gimp_data_factory_data_save (gimp->pattern_factory);
   gimp_data_factory_data_save (gimp->gradient_factory);