(init_fontconfig): call FcConfigBuildFonts()

explicitly.

diff --git a/ChangeLog b/ChangeLog
index 8a59a23578f880afcf04d51dbfe45d97ffc65982..2255eaf9d62f375890dbfcfffb46225e54cf926f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/font-config.cc (init_fontconfig): call FcConfigBuildFonts()
+       explicitly.
+
        * lily/font-config-scheme.cc (LY_DEFINE): also display font and
        config dirs. Aids debugging. 
        (display_config): also display config files.

diff --git a/lily/font-config.cc b/lily/font-config.cc
index c26a1242aa59223eac7e189381fa88b81861dc92..1e39ecbffbec15020894617d1da497e5651046f5 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -36,8 +36,6 @@ init_fontconfig ()
   if (!is_file ((char*)cache_file))
     message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
                        
-  FcConfigSetCurrent (font_config_global);
-  
   Array<String> dirs;
 
   dirs.push (prefix_directory + "/fonts/otf/");
@@ -52,6 +50,8 @@ init_fontconfig ()
        message (_f ("adding font directory: %s", dir.to_str0 ()));
     }
 
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)
     progress_indication ("\n");