Global cache time checking was using wrong file name and computing wrong

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 264c5b4ceaba1a2fd2d9fef751331182f999ed5e..995a9086b4cdd789ff8f642acc99863df5fa3f6b 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -70,7 +70,7 @@ FcFileScan (FcFontSet     *set,
                /*
                 * Found a cache entry for the file
                 */
-               if (FcGlobalCacheCheckTime (&cache_file->info))
+               if (FcGlobalCacheCheckTime (file, &cache_file->info))
                {
                    name = cache_file->name;
                    need_scan = FcFalse;
@@ -89,7 +89,8 @@ FcFileScan (FcFontSet     *set,
                                                       strlen ((const char *) file),
                                                       FcFalse)))
            {
-               if (FcGlobalCacheCheckTime (&cache_dir->info))
+               if (FcGlobalCacheCheckTime (cache_dir->info.file, 
+                                           &cache_dir->info))
                {
                    font = 0;
                    need_scan = FcFalse;
@@ -199,6 +200,9 @@ FcDirScan (FcFontSet            *set,
     strcat ((char *) file, "/");
     base = file + strlen ((char *) file);
     
+    if (FcDebug () & FC_DBG_SCAN)
+       printf ("\tScanning dir %s\n", dir);
+       
     d = opendir ((char *) dir);
     
     if (!d)