gnumeric r16937 - in branches/gnumeric-1-8: . src

[mortenw svn gnome org]

Author: mortenw
Date: Tue Oct 28 17:46:57 2008
New Revision: 16937
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16937&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:
   branches/gnumeric-1-8/ChangeLog
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/src/style.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Tue Oct 28 17:46:57 2008
@@ -29,6 +29,7 @@
 	* Fix problems with invalid dates in fn-financial.  [#540690]
 	* Fix MATCH problem with singletons.  [#540996]
 	* Fix DDB problems.  [#541158]
+	* Add workaround for pango bug.  [#558100, #558254].
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.3

Modified: branches/gnumeric-1-8/src/style.c
==============================================================================
--- branches/gnumeric-1-8/src/style.c	(original)
+++ branches/gnumeric-1-8/src/style.c	Tue Oct 28 17:46:57 2008
@@ -380,17 +380,6 @@
 	g_free (gnumeric_default_font_name);
 	gnumeric_default_font_name = NULL;
 
-	if (fontmap) {
-		/*
-		 * Workaround for bug #143542 (PangoFT2Fontmap leak).
-		 * See also bug #148997 (Text layer rendering leaks font file
-		 * descriptor).
-		 */
-		pango_ft2_font_map_substitute_changed (PANGO_FT2_FONT_MAP (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) {
@@ -408,6 +397,19 @@
 	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) {
+		/*
+		 * Workaround for bug #143542 (PangoFT2Fontmap leak).
+		 * See also bug #148997 (Text layer rendering leaks font file
+		 * descriptor).
+		 */
+		pango_ft2_font_map_substitute_changed (PANGO_FT2_FONT_MAP (fontmap));
+
+		/* Do this late -- see bugs 558100 and 558254.  */
+		g_object_unref (fontmap);
+		fontmap = NULL;
+	}
 }
 
 /**