gnome-settings-daemon r592 - in trunk: . plugins/xsettings

[behdad svn gnome org]

Author: behdad
Date: Thu Nov  6 03:43:06 2008
New Revision: 592
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=592&view=rev

Log:
2008-11-05  Behdad Esfahbod  <behdad gnome org>

        * plugins/xsettings/fontconfig-monitor.c (fontconfig_cache_init):
        * plugins/xsettings/fontconfig-monitor.h:
        * plugins/xsettings/gsd-xsettings-manager.c
        (start_fontconfig_monitor):  Only initialize fontconfig when starting
        up.  A cache update is redundant there. (bug #559550)

Modified:
   trunk/ChangeLog
   trunk/plugins/xsettings/fontconfig-monitor.c
   trunk/plugins/xsettings/fontconfig-monitor.h
   trunk/plugins/xsettings/gsd-xsettings-manager.c

Modified: trunk/plugins/xsettings/fontconfig-monitor.c
==============================================================================
--- trunk/plugins/xsettings/fontconfig-monitor.c	(original)
+++ trunk/plugins/xsettings/fontconfig-monitor.c	Thu Nov  6 03:43:06 2008
@@ -33,6 +33,12 @@
                GFileMonitorEvent event_type,
                gpointer handle);
 
+void
+fontconfig_cache_init (void)
+{
+        FcInit ();
+}
+
 gboolean
 fontconfig_cache_update (void)
 {

Modified: trunk/plugins/xsettings/fontconfig-monitor.h
==============================================================================
--- trunk/plugins/xsettings/fontconfig-monitor.h	(original)
+++ trunk/plugins/xsettings/fontconfig-monitor.h	Thu Nov  6 03:43:06 2008
@@ -25,6 +25,7 @@
 
 G_BEGIN_DECLS
 
+void fontconfig_cache_init (void);
 gboolean fontconfig_cache_update (void);
 
 typedef struct _fontconfig_monitor_handle fontconfig_monitor_handle_t;

Modified: trunk/plugins/xsettings/gsd-xsettings-manager.c
==============================================================================
--- trunk/plugins/xsettings/gsd-xsettings-manager.c	(original)
+++ trunk/plugins/xsettings/gsd-xsettings-manager.c	Thu Nov  6 03:43:06 2008
@@ -583,7 +583,7 @@
 {
         gnome_settings_profile_start (NULL);
 
-        fontconfig_cache_update ();
+        fontconfig_cache_init ();
 
         g_idle_add ((GSourceFunc) start_fontconfig_monitor_idle_cb, manager);