(LY_DEFINE): also display font and

config dirs. Aids debugging.
(display_config): also display config files.

diff --git a/ChangeLog b/ChangeLog
index 163b5bf1d26e4fb2bafbaca061e6492f67112477..8a59a23578f880afcf04d51dbfe45d97ffc65982 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * lily/font-config-scheme.cc (LY_DEFINE): also display font and
        config dirs. Aids debugging. 
+       (display_config): also display config files.
 
 2006-01-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
index 157d1bb9110ca8dc2ab316efc78e020a12d5913a..90211f83539d4f0765a3ced06cc0bbd53c802d95 100644 (file)
--- a/lily/font-config-scheme.cc
+++ b/lily/font-config-scheme.cc
@@ -44,10 +44,11 @@ display_strlist (char const*what, FcStrList *slist)
 }
 
 void
-display_dirs (FcConfig *fcc)
+display_config (FcConfig *fcc)
 {
-  display_strlist ("config dir", FcConfigGetConfigDirs(fcc));
-  display_strlist ("font dir", FcConfigGetFontDirs(fcc));
+  display_strlist ("Config files", FcConfigGetConfigFiles(fcc));
+  display_strlist ("Config dir", FcConfigGetConfigDirs(fcc));
+  display_strlist ("Font dir", FcConfigGetFontDirs(fcc));
 }
 
 void
@@ -72,12 +73,13 @@ display_list (FcConfig *fcc)
 }
 
 
+
 LY_DEFINE (ly_font_config_display_fonts, "ly:font-config-display-fonts", 0, 0, 0,
           (),
           "Dump a list of all fonts visible to FontConfig.")
 {
   display_list (NULL);
-  display_dirs (NULL);
+  display_config (NULL);
   
   return SCM_UNSPECIFIED;
 }