diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2015-06-26 17:02:13 -0700 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2015-06-26 17:02:13 -0700 |
| commit | 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e (patch) | |
| tree | c4b202cddf5a71eafd3f1cbe6dc5fc98ad7451fc /doc | |
| parent | a8096dfa5965bfb1953fe829ff13eea23b4233c7 (diff) | |
Revert changes made to FcConfigAppFontAddDir() recently
In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of
FcConfigAppFontAddFile/Dir() were changed to return false
if not fonts were found. While this is welldefined and useful
for AddFile(), it's quite problematic for AddDir(). For example,
if the directory is empty, is that a failure or success? Worse,
the false value from AddDir() was being propagated all the way
to FcInit() returning false now. This only happened upon memory
allocation failure before, and some clients assert that FcInit()
is successful.
With this change, AddDir() is reverted back to what it was.
AddFont() change (which was actually in fcdir.c) from the original
commit is left in.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/fcconfig.fncs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/fcconfig.fncs b/doc/fcconfig.fncs index af328fc7..a2ce5c84 100644 --- a/doc/fcconfig.fncs +++ b/doc/fcconfig.fncs @@ -232,7 +232,7 @@ the current configuration is used. @DESC@ Scans the specified directory for fonts, adding each one found to the application-specific set of fonts. Returns FcFalse -if the fonts cannot be added (due to allocation failure or no fonts found). +if the fonts cannot be added (due to allocation failure). Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, the current configuration is used. @@ |