AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkIconTheme: Drop the all_icons hash table

Browse Source 
It is not used anywhere anymore.
This commit is contained in:
Matthias Clasen 2014-06-19 21:39:45 -04:00
parent 11ec8f7285
commit 13c354db8d
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkicontheme.c
View File

@ -184,13 +184,7 @@ struct _GtkIconThemePrivate
GList *themes; GList *themes;
GHashTable *unthemed_icons; GHashTable *unthemed_icons;
/* Note: The keys of this hashtable are owned by the /* GdkScreen for the icon theme (may be NULL) */
* themedir and unthemed hashtables.
*/
GHashTable *all_icons;
/* GdkScreen for the icon theme (may be NULL)
*/
GdkScreen *screen; GdkScreen *screen;
/* time when we last stat:ed for theme changes */ /* time when we last stat:ed for theme changes */
@ -814,7 +808,6 @@ blow_themes (GtkIconTheme *icon_theme)
if (priv->themes_valid) if (priv->themes_valid)
{ {
g_hash_table_destroy (priv->all_icons);
g_list_free_full (priv->themes, (GDestroyNotify) theme_destroy); g_list_free_full (priv->themes, (GDestroyNotify) theme_destroy);
g_list_free_full (priv->dir_mtimes, (GDestroyNotify) free_dir_mtime); g_list_free_full (priv->dir_mtimes, (GDestroyNotify) free_dir_mtime);
g_hash_table_destroy (priv->unthemed_icons); g_hash_table_destroy (priv->unthemed_icons);
@ -822,7 +815,6 @@ blow_themes (GtkIconTheme *icon_theme)
priv->themes = NULL; priv->themes = NULL;
priv->unthemed_icons = NULL; priv->unthemed_icons = NULL;
priv->dir_mtimes = NULL; priv->dir_mtimes = NULL;
priv->all_icons = NULL;
priv->themes_valid = FALSE; priv->themes_valid = FALSE;
} }
@ -1225,8 +1217,6 @@ load_themes (GtkIconTheme *icon_theme)
priv = icon_theme->priv; priv = icon_theme->priv;
priv->all_icons = g_hash_table_new (g_str_hash, g_str_equal);
if (priv->current_theme) if (priv->current_theme)
insert_theme (icon_theme, priv->current_theme); insert_theme (icon_theme, priv->current_theme);
@ -1318,11 +1308,7 @@ load_themes (GtkIconTheme *icon_theme)
unthemed_icon->no_svg_filename = abs_file; unthemed_icon->no_svg_filename = abs_file;
/* takes ownership of base_name */ /* takes ownership of base_name */
g_hash_table_replace (priv->unthemed_icons, g_hash_table_replace (priv->unthemed_icons, base_name, unthemed_icon);
base_name,
unthemed_icon);
g_hash_table_insert (priv->all_icons,
base_name, NULL);
} }
} }
} }
@ -3068,7 +3054,6 @@ 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_replace (icon_theme->all_icons, base_name, NULL);
/* takes ownership of base_name */ /* takes ownership of base_name */
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));
} }