pango r2734 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Tue Oct 28 17:09:21 2008
New Revision: 2734
URL: http://svn.gnome.org/viewvc/pango?rev=2734&view=rev

Log:
2008-10-28  Behdad Esfahbod  <behdad gnome org>

        Bug 558254 â Internal reference handling messed up

        * pango/pangofc-font.c (pango_fc_font_get_coverage):
        * pango/pangofc-fontmap.c (pango_fc_font_map_finalize):
        Make sure fonts->fontmap is set to NULL when fontmap finalizes.

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

Modified: trunk/pango/pangofc-font.c
==============================================================================
--- trunk/pango/pangofc-font.c	(original)
+++ trunk/pango/pangofc-font.c	Tue Oct 28 17:09:21 2008
@@ -309,6 +309,9 @@
       return _pango_fc_font_map_fc_to_coverage (charset);
     }
 
+  if (!fcfont->fontmap)
+    return pango_coverage_new ();
+
   return _pango_fc_font_map_get_coverage (PANGO_FC_FONT_MAP (fcfont->fontmap),
 					  fcfont);
 }

Modified: trunk/pango/pangofc-fontmap.c
==============================================================================
--- trunk/pango/pangofc-fontmap.c	(original)
+++ trunk/pango/pangofc-fontmap.c	Tue Oct 28 17:09:21 2008
@@ -484,7 +484,10 @@
   PangoFcFontMap *fcfontmap = PANGO_FC_FONT_MAP (object);
   PangoFcFontMapPrivate *priv = fcfontmap->priv;
 
-  pango_fc_font_map_cache_clear (fcfontmap);
+
+  /* Shutdown, so we clear the fonts and mark them as shut down */
+  pango_fc_font_map_shutdown (fcfontmap);
+
   g_queue_free (priv->fontset_cache);
   g_hash_table_destroy (priv->coverage_hash);