callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Chris Wilson
2007-04-24 14:55:52 +00:00
committed by Chris Wilson
parent 954746fa05
commit 18a9c78bf3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
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> 2007-04-23 Cody Russell <bratsche@gnome.org>
* modules/engines/ms-windows/msw_style.c: Fixed one-pixel drawing error on * 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 left-most tab when notebooks are top-oriented. Also general cleanup of

2
gtk/gtkicontheme.c
View File

@ -2320,7 +2320,7 @@ scan_directory (GtkIconThemePrivate *icon_theme,
base_name = strip_suffix (name); base_name = strip_suffix (name);
hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_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)); g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix));
} }