mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-20 05:50:11 +00:00
Ignore images in the toplevel theme directory, avoiding one source of
2008-02-05 Matthias Clasen <mclasen@redhat.com> * gtk/updateiconcache.c: Ignore images in the toplevel theme directory, avoiding one source of invalid caches that has been spotted in the wild. svn path=/trunk/; revision=19466
This commit is contained in:
parent
d9efa71c84
commit
d03a5fb35c
@ -1,3 +1,9 @@
|
||||
2008-02-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/updateiconcache.c: Ignore images in the toplevel theme
|
||||
directory, avoiding one source of invalid caches that has been
|
||||
spotted in the wild.
|
||||
|
||||
2008-02-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/updateiconcache.c: Fix the previous commit to compile.
|
||||
|
@ -623,6 +623,10 @@ scan_directory (const gchar *base_path,
|
||||
continue;
|
||||
}
|
||||
|
||||
/* ignore images in the toplevel directory */
|
||||
if (subdir == NULL)
|
||||
continue;
|
||||
|
||||
retval = g_file_test (path, G_FILE_TEST_IS_REGULAR);
|
||||
if (retval)
|
||||
{
|
||||
@ -1473,7 +1477,7 @@ build_cache (const gchar *path)
|
||||
if (!validate_file (tmp_cache_path))
|
||||
{
|
||||
g_printerr (_("The generated cache was invalid.\n"));
|
||||
g_unlink (tmp_cache_path);
|
||||
//g_unlink (tmp_cache_path);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user