060_ignore-random-icons.patch 1.1 KB

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