gtk+ r19466 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Feb  5 22:20:12 2008
New Revision: 19466
URL: http://svn.gnome.org/viewvc/gtk+?rev=19466&view=rev

Log:
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.




Modified:
   trunk/ChangeLog
   trunk/gtk/updateiconcache.c

Modified: trunk/gtk/updateiconcache.c
==============================================================================
--- trunk/gtk/updateiconcache.c	(original)
+++ trunk/gtk/updateiconcache.c	Tue Feb  5 22:20:12 2008
@@ -623,6 +623,10 @@
 	  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 @@
   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);
     }