diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-06-20 11:22:17 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-06-20 11:22:17 -0400 |
| commit | e0be405a1dd5765e36152c754a47c8ad7ff0ab85 (patch) | |
| tree | 5a02965a7ec142e5b27dced988f1ee893404eac7 /src | |
| parent | 0fcf866d44c46bd63d91f656e36544b6ce9af47d (diff) | |
Bug 26718 - "fc-match sans file" doesn't work
- Do not throw away FC_FILE in FcNameUnparse
- Update the builtin "fclist" format to remove FC_FILE properly instead
- Switch fc-list to use FcPatternFormat()
Note that I had previously broken fc-list and it was not showing the
file name anymore. No one noticed that it seems! Now fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fcformat.c | 2 | ||||
| -rw-r--r-- | src/fcname.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/fcformat.c b/src/fcformat.c index 1368b718..796957db 100644 --- a/src/fcformat.c +++ b/src/fcformat.c @@ -75,7 +75,7 @@ #define FCMATCH_FORMAT "%{file:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\"" -#define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}" +#define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" #define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" diff --git a/src/fcname.c b/src/fcname.c index 86c10b65..d77eff6f 100644 --- a/src/fcname.c +++ b/src/fcname.c @@ -874,8 +874,7 @@ FcNameUnparseEscaped (FcPattern *pat, FcBool escape) { o = &l->types[i]; if (!strcmp (o->object, FC_FAMILY) || - !strcmp (o->object, FC_SIZE) || - !strcmp (o->object, FC_FILE)) + !strcmp (o->object, FC_SIZE)) continue; e = FcPatternObjectFindElt (pat, FcObjectFromName (o->object)); |