summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-06-30 18:42:58 +0000
committerKeith Packard <keithp@keithp.com>2004-06-30 18:42:58 +0000
commit0d71dde9b4c2372bd894a078a92f5596822bcc5a (patch)
treeb8adb94b24caf9e847d7848647372edb10892644
parent2ebc1050795f574a54abc73d99f4f35751f62ec5 (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--ChangeLog14
-rw-r--r--src/fccfg.c4
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0794548..fbc2540 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-04-07 Keith Packard <keithp@keithp.com>
* configure.in:
diff --git a/src/fccfg.c b/src/fccfg.c
index d0cf358..63163c2 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -147,9 +147,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;
}