Ensure the icon_theme->all_icons and dir->icons hash tables use the same

2007-04-24  Chris Wilson  <chris@chris-wilson.co.uk>

    * gtk/gtkicontheme.c (scan_directory): Ensure the 
    icon_theme->all_icons and dir->icons hash tables use the same string
    as their keys. (#418531)


svn path=/branches/gtk-2-10/; revision=17625
This commit is contained in:
Chris Wilson
2007-04-24 14:51:52 +00:00
committed by Chris Wilson
parent 6411857a0c
commit 0131d4ecde
2 changed files with 7 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
2007-04-24 Chris Wilson <chris@chris-wilson.co.uk>
* gtk/gtkicontheme.c (scan_directory): Ensure the
icon_theme->all_icons and dir->icons hash tables use the same string
as their keys. (#418531)
2007-04-23 Cody Russell <bratsche@gnome.org>
Backported from trunk:

View File

@@ -2241,7 +2241,7 @@ scan_directory (GtkIconThemePrivate *icon_theme,
base_name = strip_suffix (name);
hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_name));
g_hash_table_insert (icon_theme->all_icons, base_name, NULL);
g_hash_table_replace (icon_theme->all_icons, base_name, NULL);
g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix));
}