Commit 86db9233 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Make icon data caching work again. (#168851, Alexander Larsson)

2005-03-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (theme_lookup_icon): Make
	icon data caching work again.  (#168851, Alexander Larsson)
parent 6834bb95
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)
* gdk-pixbuf/gdk-pixbuf.c:
* gdk-pixbuf/gdk-pixbuf-features.h.in:
Revert the previous change, since it breaks
......
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)
* gdk-pixbuf/gdk-pixbuf.c:
* gdk-pixbuf/gdk-pixbuf-features.h.in:
Revert the previous change, since it breaks
......
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)
* gdk-pixbuf/gdk-pixbuf.c:
* gdk-pixbuf/gdk-pixbuf-features.h.in:
Revert the previous change, since it breaks
......
......@@ -1897,7 +1897,12 @@ theme_lookup_icon (IconTheme *theme,
icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
-1, NULL, NULL, NULL);
#endif
if (min_dir->cache && has_icon_file)
if (min_dir->icon_data != NULL)
icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
if (icon_info->data == NULL &&
min_dir->cache && has_icon_file)
{
gchar *icon_file_name, *icon_file_path;
......@@ -1910,13 +1915,12 @@ theme_lookup_icon (IconTheme *theme,
min_dir->icon_data = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, (GDestroyNotify)icon_data_free);
load_icon_data (min_dir, icon_file_path, icon_file_name);
icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
}
g_free (icon_file_name);
g_free (icon_file_path);
}
if (min_dir->icon_data != NULL)
icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
icon_info->dir_type = min_dir->type;
icon_info->dir_size = min_dir->size;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment