gnumeric r16936 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Tue Oct 28 17:42:06 2008
New Revision: 16936
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16936&view=rev

Log:
2008-10-28  Morten Welinder  <terra gnome org>

	* src/style.c (gnm_font_shutdown): Workaround for 558100 and
	558254.  Thanks to Hib Eris and Behdad for debugging.




Modified:
   trunk/ChangeLog
   trunk/src/style.c

Modified: trunk/src/style.c
==============================================================================
--- trunk/src/style.c	(original)
+++ trunk/src/style.c	Tue Oct 28 17:42:06 2008
@@ -384,11 +384,6 @@
 	g_free (gnumeric_default_font_name);
 	gnumeric_default_font_name = NULL;
 
-	if (fontmap) {
-		g_object_unref (fontmap);
-		fontmap = NULL;
-	}
-
 	/* Make a list of the fonts, then unref them.  */
 	g_hash_table_foreach (style_font_hash, (GHFunc) list_cached_fonts, &fonts);
 	for (tmp = fonts; tmp; tmp = tmp->next) {
@@ -406,6 +401,12 @@
 	g_hash_table_foreach (style_font_negative_hash, (GHFunc) delete_neg_font, NULL);
 	g_hash_table_destroy (style_font_negative_hash);
 	style_font_negative_hash = NULL;
+
+	if (fontmap) {
+		/* Do this late -- see bugs 558100 and 558254.  */
+		g_object_unref (fontmap);
+		fontmap = NULL;
+	}
 }
 
 /**