patches/gtk2/060_ignore-random-icons.patch

   1 From: Loic Minier <lool@dooz.org>
   2 Date: Sun, 21 Oct 2007 22:05:42 +0200
   3 Subject: Don't list images from unknown directories in icon cache
   4
   5 After GTK 2.12.0, gtk-update-icon-cache fails if there is a PNG file
   6 placed directly in /usr/share/icons/hicolor (not in a correct
   7 subdirectory like 48x48/apps).
   8
   9 TODO: This is believed to have been fixed differently upstream, so maybe
  10 this change is no longer necessary:
  11 "I believe a slightly different fix that I did some time ago fixes this
  12 too." --Matthias Clasen, 2008-02-16 04:43:10 UTC
  13
  14 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=451634
  15 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=444285
  16 Forwarded: yes
  17 Applied-upstream: no
  18 ---
  19  gtk/updateiconcache.c | 2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
  23 index 39e1345..9fecf12 100644
  24 --- a/gtk/updateiconcache.c
  25 +++ b/gtk/updateiconcache.c
  26 @@ -679,7 +679,7 @@ scan_directory (const gchar *base_path,
  27                       directories = g_list_append (directories, g_strdup (subdir));
  28                     }
  29                   else
  30 -                   dir_index = 0xffff;
  31 +                   continue;
  32                 }
  33
  34               image = g_new0 (Image, 1);