callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore images in the toplevel theme directory, avoiding one source of

Browse Source 
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:
Matthias Clasen
2008-02-05 22:20:12 +00:00
committed by Matthias Clasen
parent d9efa71c84
commit d03a5fb35c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-02-05 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Fix the previous commit to compile. * gtk/updateiconcache.c: Fix the previous commit to compile.

6
gtk/updateiconcache.c
View File

@ -623,6 +623,10 @@ scan_directory (const gchar *base_path,
continue; continue;
} }
/* ignore images in the toplevel directory */
if (subdir == NULL)
continue;
retval = g_file_test (path, G_FILE_TEST_IS_REGULAR); retval = g_file_test (path, G_FILE_TEST_IS_REGULAR);
if (retval) if (retval)
{ {
@ -1473,7 +1477,7 @@ build_cache (const gchar *path)
if (!validate_file (tmp_cache_path)) if (!validate_file (tmp_cache_path))
{ {
g_printerr (_("The generated cache was invalid.\n")); g_printerr (_("The generated cache was invalid.\n"));
g_unlink (tmp_cache_path); //g_unlink (tmp_cache_path);
exit (1); exit (1);
} }