gtk+ r21134 - in trunk: . gtk

[behdad svn gnome org]

Author: behdad
Date: Fri Aug 15 19:43:20 2008
New Revision: 21134
URL: http://svn.gnome.org/viewvc/gtk+?rev=21134&view=rev

Log:
2008-08-15  Behdad Esfahbod  <behdad gnome org>

        Bug 547680 â fontconfig monitoring can crash apps

        * gtk/gtksettings.c (settings_update_fontconfig): Clear pango cache
        before recreating fontconfig config.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtksettings.c

Modified: trunk/gtk/gtksettings.c
==============================================================================
--- trunk/gtk/gtksettings.c	(original)
+++ trunk/gtk/gtksettings.c	Fri Aug 15 19:43:20 2008
@@ -2090,7 +2090,7 @@
   static guint    last_update_timestamp;
   static gboolean last_update_needed;
 
-  gint timestamp;
+  guint timestamp;
 
   g_object_get (settings,
 		"gtk-fontconfig-timestamp", &timestamp,
@@ -2105,11 +2105,12 @@
       PangoFontMap *fontmap = pango_cairo_font_map_get_default ();
       gboolean update_needed = FALSE;
 
-      if (PANGO_IS_FC_FONT_MAP (fontmap) &&
-	  !FcConfigUptoDate (NULL) && FcInitReinitialize ())
+      /* bug 547680 */
+      if (PANGO_IS_FC_FONT_MAP (fontmap) && !FcConfigUptoDate (NULL))
 	{
-	  update_needed = TRUE;
 	  pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (fontmap));
+	  if (FcInitReinitialize ())
+	    update_needed = TRUE;
 	}
 
       last_update_timestamp = timestamp;