Actually use the directories that I added to the global cache. Fixes 'make
check'.
This commit is contained in:
parent
275cf6cd83
commit
3616cbe251
|
@ -1,3 +1,9 @@
|
|||
2006-01-30 Patrick Lam <plam@mit.edu>
|
||||
* src/fccache.c (FcGlobalCacheReadDir):
|
||||
|
||||
Actually use the directories that I added to the global cache.
|
||||
Fixes 'make check'.
|
||||
|
||||
2006-01-30 Mike Fabian <mfabian@suse.de>
|
||||
reviewed by: plam
|
||||
|
||||
|
|
|
@ -315,6 +315,7 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
|
|||
{
|
||||
FcGlobalCacheDir *d;
|
||||
FcBool ret = FcFalse;
|
||||
int i;
|
||||
|
||||
if (cache->fd == -1)
|
||||
return FcFalse;
|
||||
|
@ -329,10 +330,16 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
|
|||
lseek (cache->fd, d->offset, SEEK_SET);
|
||||
if (!FcDirCacheConsume (cache->fd, d->name, set, config))
|
||||
return FcFalse;
|
||||
|
||||
if (strcmp (d->name, dir) == 0)
|
||||
{
|
||||
for (i = 0; i < d->subdirs->num; i++)
|
||||
FcStrSetAdd (dirs, (FcChar8 *)d->subdirs->strs[i]);
|
||||
|
||||
ret = FcTrue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue