pango r2816 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Thu Jan 29 09:19:33 2009
New Revision: 2816
URL: http://svn.gnome.org/viewvc/pango?rev=2816&view=rev

Log:
2009-01-29  Behdad Esfahbod  <behdad gnome org>

        * pango/pangofc-fontmap.c (pango_fc_font_map_fini),
        (pango_fc_font_map_shutdown): Don't disassociate family from fontmap
        during cache_clear().

Modified:
   trunk/ChangeLog
   trunk/pango/pangofc-fontmap.c

Modified: trunk/pango/pangofc-fontmap.c
==============================================================================
--- trunk/pango/pangofc-fontmap.c	(original)
+++ trunk/pango/pangofc-fontmap.c	Thu Jan 29 09:19:33 2009
@@ -1009,10 +1009,7 @@
   priv->pattern_hash = NULL;
 
   for (i = 0; i < priv->n_families; i++)
-    {
-      priv->families[i]->fontmap = NULL;
-      g_object_unref (priv->families[i]);
-    }
+    g_object_unref (priv->families[i]);
   g_free (priv->families);
   priv->n_families = -1;
   priv->families = NULL;
@@ -1843,11 +1840,14 @@
 pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap)
 {
   PangoFcFontMapPrivate *priv = fcfontmap->priv;
+  int i;
 
   if (priv->closed)
     return;
 
   g_hash_table_foreach (priv->font_hash, (GHFunc) shutdown_font, NULL);
+  for (i = 0; i < priv->n_families; i++)
+    priv->families[i]->fontmap = NULL;
 
   pango_fc_font_map_fini (fcfontmap);
 
@@ -2243,8 +2243,8 @@
 
 static void
 pango_fc_family_list_faces (PangoFontFamily  *family,
-			     PangoFontFace  ***faces,
-			     int              *n_faces)
+			    PangoFontFace  ***faces,
+			    int              *n_faces)
 {
   PangoFcFamily *fcfamily = PANGO_FC_FAMILY (family);
   PangoFcFontMap *fcfontmap = fcfamily->fontmap;