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

Added 081_icon-cache-validate.patch, GBOME #476342

Browse Source
This commit is contained in:
Alan Baghumian
2007-09-16 16:51:23 +00:00
parent 93294c707a
commit d458a19645
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ gtk+2.0 (2.12.0-1) UNRELEASED; urgency=low
[ Alan Baghumian ] [ Alan Baghumian ]
* New upstream stable release * New upstream stable release
- Regenerated 070_mandatory-relibtoolize.patch - Regenerated 070_mandatory-relibtoolize.patch
* Added 081_icon-cache-validate.patch, GNOME #476342
[ Loic Minier ] [ Loic Minier ]
* Refresh patches 033_treeview_resizing and 040_filechooser_single-click to * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to

30
debian/patches/081_icon-cache-validate.patch vendored Normal file
View File

@ -0,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);