diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
| commit | 8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (patch) | |
| tree | 033ceda857988a1f0ca49e35eb848e37e281631f /fontconfig/fc-list/fc-list.c | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.gz vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.bz2 vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.zip | |
fontconfig mesa git update 21 June 2011
Diffstat (limited to 'fontconfig/fc-list/fc-list.c')
| -rw-r--r-- | fontconfig/fc-list/fc-list.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fontconfig/fc-list/fc-list.c b/fontconfig/fc-list/fc-list.c index 12c2ca550..ad383328e 100644 --- a/fontconfig/fc-list/fc-list.c +++ b/fontconfig/fc-list/fc-list.c @@ -156,7 +156,9 @@ main (int argc, char **argv) if (quiet && !os) os = FcObjectSetCreate (); if (!verbose && !format && !os) - os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0); + os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_FILE, (char *) 0); + if (!format) + format = "%{=fclist}\n"; fs = FcFontList (0, pat, os); if (os) FcObjectSetDestroy (os); @@ -173,7 +175,7 @@ main (int argc, char **argv) { FcPatternPrint (fs->fonts[j]); } - else if (format) + else { FcChar8 *s; @@ -184,17 +186,6 @@ main (int argc, char **argv) free (s); } } - else - { - FcChar8 *str; - FcChar8 *file; - - str = FcNameUnparse (fs->fonts[j]); - if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch) - printf ("%s: ", file); - printf ("%s\n", str); - free (str); - } } } |