aa4ea23ee2
updates.
- Drop patches 031_gtksearchenginetracker_fixes,
080_from_bugzilla_workaround_eclipse_crash, 081_icon-cache-validate
fixed upstream.
- Refresh patches 033_treeview_resizing, 040_filechooser_single-click to
apply cleanly.
- Drop patches 060_opening-display-by-env-error-message,
065_gtk-filechooser-locale-time merged upstream.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
31 lines
826 B
Diff
31 lines
826 B
Diff
# 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);
|
|
|