Merge branch 'compose-cache-symlinks' into 'master'

composetable: invalidate cache based on symlink mtime too

See merge request GNOME/gtk!4163
This commit is contained in:
Matthias Clasen 2021-11-16 17:21:04 +00:00
commit 2026256823

View File

@ -755,8 +755,11 @@ gtk_compose_table_load_cache (const char *compose_file,
if (!g_file_test (path, G_FILE_TEST_EXISTS))
goto out_load_cache;
g_stat (compose_file, &original_buf);
g_stat (path, &cache_buf);
g_lstat (compose_file, &original_buf);
if (original_buf.st_mtime > cache_buf.st_mtime)
goto out_load_cache;
g_stat (compose_file, &original_buf);
if (original_buf.st_mtime > cache_buf.st_mtime)
goto out_load_cache;
if (!g_file_get_contents (path, &contents, &total_length, &error))