Don't crash if there is no cache. (#170652, Diego Gonzalez)

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

	* gtk/gtkicontheme.c (theme_lookup_icon): Don't crash
	if there is no cache.  (#170652, Diego Gonzalez)
This commit is contained in:
Matthias Clasen 2005-03-17 18:13:46 +00:00 committed by Matthias Clasen
parent 86009fba38
commit c4aa487d72
4 changed files with 10 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2005-03-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Don't crash
if there is no cache. (#170652, Diego Gonzalez)
* gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix):
Make inline completion insert the prefix at the
right spot. (#170146, Doug Quale)

View File

@ -1,5 +1,8 @@
2005-03-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Don't crash
if there is no cache. (#170652, Diego Gonzalez)
* gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix):
Make inline completion insert the prefix at the
right spot. (#170146, Doug Quale)

View File

@ -1,5 +1,8 @@
2005-03-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (theme_lookup_icon): Don't crash
if there is no cache. (#170652, Diego Gonzalez)
* gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix):
Make inline completion insert the prefix at the
right spot. (#170146, Doug Quale)

View File

@ -1891,7 +1891,7 @@ theme_lookup_icon (IconTheme *theme,
if (min_dir->icon_data != NULL)
icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
else
else if (min_dir->cache != NULL)
icon_info->data = _gtk_icon_cache_get_icon_data (min_dir->cache, icon_name, min_dir->subdir);
if (icon_info->data == NULL &&