accidental-engraver cleanups.

[lilypond.git] / lily / font-config.cc

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 0993f8183722a982a11cb72c2542c530a5365ef3..cbf77c7944d012c9186e50edb1c1dd7143a1f034 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,9 +30,11 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+#if 0
+  // always returns 0 for FC 2.4
   if (!cache_file)
     programming_error ("Cannot find file for FontConfig cache.");
-
+#endif
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.
@@ -50,7 +52,7 @@ init_fontconfig ()
     {
       string dir = dirs[i];
       if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
-       error (_f ("adding font directory: %s", dir.c_str ()));
+       error (_f ("failed adding font directory: %s", dir.c_str ()));
       else if (be_verbose_global)
        message (_f ("adding font directory: %s", dir.c_str ()));
     }