r12489 - in /desktop/experimental/gtk+2.0/debian: changelog patches/081_icon-cache-validate.patch

[alanbach-guest at users.alioth.debian.org]

Author: alanbach-guest
Date: Sun Sep 16 16:51:23 2007
New Revision: 12489

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12489
Log:
Added 081_icon-cache-validate.patch, GBOME #476342

Added:
    desktop/experimental/gtk+2.0/debian/patches/081_icon-cache-validate.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=12489&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Sun Sep 16 16:51:23 2007
@@ -3,6 +3,7 @@
   [ Alan Baghumian ]
   * New upstream stable release
     - Regenerated 070_mandatory-relibtoolize.patch
+  * Added 081_icon-cache-validate.patch, GNOME #476342  
 
   [ Loic Minier ]
   * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to

Added: desktop/experimental/gtk+2.0/debian/patches/081_icon-cache-validate.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/081_icon-cache-validate.patch?rev=12489&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/081_icon-cache-validate.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/081_icon-cache-validate.patch Sun Sep 16 16:51:23 2007
@@ -1,0 +1,30 @@
+# See: http://bugzilla.gnome.org/show_bug.cgi?id=476342
+
+--- trunk/gtk/gtkiconcache.c	2007/09/14 01:01:59	18822
++++ trunk/gtk/gtkiconcache.c	2007/09/14 02:11:01	18823
+@@ -127,14 +127,19 @@
+   info.n_directories = 0;
+   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
+ 
+-  if (!_gtk_icon_cache_validate (&info))
++#ifdef G_ENABLE_DEBUG
++  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
+     {
+-      g_mapped_file_free (map);
+-      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
++      if (!_gtk_icon_cache_validate (&info))
++        {
++          g_mapped_file_free (map);
++          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+ 
+-      goto done;
++          goto done;
++        }
+     }
+-  
++#endif 
++
+   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
+ 
+   cache = g_new0 (GtkIconCache, 1);
+