pango r2768 - in trunk: . pango



Author: behdad
Date: Fri Dec 26 02:55:57 2008
New Revision: 2768
URL: http://svn.gnome.org/viewvc/pango?rev=2768&view=rev

Log:
2008-12-25  Behdad Esfahbod  <behdad gnome org>

        * pango/pangofc-fontmap.c (pango_fc_font_map_finalize),
        (pango_fc_font_map_shutdown):
        Cleanup fontmap finalization.

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	Fri Dec 26 02:55:57 2008
@@ -491,12 +491,6 @@
   g_queue_free (priv->fontset_cache);
   g_hash_table_destroy (priv->coverage_hash);
 
-  if (priv->fontset_hash)
-    g_hash_table_destroy (priv->fontset_hash);
-
-  if (priv->font_hash)
-    g_hash_table_destroy (priv->font_hash);
-
   if (priv->pattern_hash)
     g_hash_table_destroy (priv->pattern_hash);
 
@@ -1466,12 +1460,18 @@
   PangoFcFontMapPrivate *priv = fcfontmap->priv;
 
   pango_fc_font_map_cache_clear (fcfontmap);
-  g_hash_table_destroy (priv->fontset_hash);
-  priv->fontset_hash = NULL;
 
-  g_hash_table_foreach (priv->font_hash, (GHFunc)cleanup_font, NULL);
-  g_hash_table_destroy (priv->font_hash);
-  priv->font_hash = NULL;
+  if (priv->fontset_hash) {
+    g_hash_table_destroy (priv->fontset_hash);
+    priv->fontset_hash = NULL;
+  }
+
+  if (priv->font_hash) {
+    g_hash_table_foreach (priv->font_hash, (GHFunc)cleanup_font, NULL);
+    g_hash_table_destroy (priv->font_hash);
+    priv->font_hash = NULL;
+  }
+
   priv->closed = TRUE;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]