diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-04-24 14:55:52 +0000 |
|---|---|---|
| committer | Chris Wilson <cpwilson@src.gnome.org> | 2007-04-24 14:55:52 +0000 |
| commit | 18a9c78bf36be6e6c84a7fa8259b9daa4e8eb96f (patch) | |
| tree | e1c9cc09fe10237a080a2c0dec350ab2c30d7a7c | |
| parent | 954746fa05eefd56b74f3c1f92a1c982cea67f7a (diff) | |
| download | gtk+-18a9c78bf36be6e6c84a7fa8259b9daa4e8eb96f.tar.gz | |
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=/trunk/; revision=17626
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtkicontheme.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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> * modules/engines/ms-windows/msw_style.c: Fixed one-pixel drawing error on left-most tab when notebooks are top-oriented. Also general cleanup of diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 6eb4aa01ab..2aaa445dc8 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -2320,7 +2320,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)); } |