diff options
| author | Keith Packard <keithp@keithp.com> | 2004-06-30 18:41:52 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-06-30 18:41:52 +0000 |
| commit | 28f93bc4122337f59afad31e610ce17c3d2b00a2 (patch) | |
| tree | 996d0763618676b93cc1d276fb7b6c40aa91017f | |
| parent | 3d1ea0e5d48e0dfa72080a3318e3c2157500da3d (diff) | |
Provided by: Lubos Lunak <l.lunak@suse.cz>
However FcConfigUptoDate() doesn't seem to work. See the attached patch.
First there's an obvious misplaced parenthesis making it return always
false, and second, even this call fails to detect font changes (e.g.
adding a new font to /usr/X11R6/lib/X11/fonts/truetype). The patch
should fix that as well. The problem seems to be triggered by my
fonts.conf specifying only /usr/X11R6/lib/X11/fonts , and therefore
config->configDirs doesn't include subdirs, unlike config->fontDirs.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | src/fccfg.c | 4 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,17 @@ +2004-06-30 Keith Packard <keithp@keithp.com> + + Provided by: Lubos Lunak <l.lunak@suse.cz> + + * src/fccfg.c: (FcConfigUptoDate): + However FcConfigUptoDate() doesn't seem to work. See the attached + patch. First there's an obvious misplaced parenthesis making it + return always false, and second, even this call fails to detect font + changes (e.g. adding a new font to + /usr/X11R6/lib/X11/fonts/truetype). The patch should fix that as + well. The problem seems to be triggered by my fonts.conf specifying + only /usr/X11R6/lib/X11/fonts , and therefore config->configDirs + doesn't include subdirs, unlike config->fontDirs. + 2004-06-03 Keith Packard <keithp@keithp.com> * fontconfig/fontconfig.h: diff --git a/src/fccfg.c b/src/fccfg.c index b023467..5612949 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -166,9 +166,9 @@ FcConfigUptoDate (FcConfig *config) return FcFalse; } config_time = FcConfigNewestFile (config->configFiles); - font_time = FcConfigNewestFile (config->configDirs); + font_time = FcConfigNewestFile (config->fontDirs); if ((config_time.set && config_time.time - config->rescanTime > 0) || - (font_time.set && font_time.time - config->rescanTime) > 0) + (font_time.set && (font_time.time - config->rescanTime) > 0)) { return FcFalse; } |