NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix very weird double looping 

Not need to extract keys from hash, then loop keys to find data.

SVN revision: 55395
This commit is contained in:
Sebastian Dransfeld 2010-12-09 08:56:23 +00:00
parent 4440764c78
commit ac51f4ead3
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/efreet/src/lib/efreet_icon.c
View File

@ -279,12 +279,6 @@ efreet_icon_extra_list_get(void)
return &efreet_extra_icon_dirs; return &efreet_extra_icon_dirs;
} }
static Eina_Bool
_hash_keys(Eina_Hash *hash __UNUSED__, const void *key, void *list)
{
*(Eina_List**)list = eina_list_append(*(Eina_List**)list, key);
return EINA_TRUE;
}
/** /**
* @return Returns a list of Efreet_Icon structs for all the non-hidden icon * @return Returns a list of Efreet_Icon structs for all the non-hidden icon
* themes * themes
@ -295,23 +289,16 @@ EAPI Eina_List *
efreet_icon_theme_list_get(void) efreet_icon_theme_list_get(void)
{ {
Eina_List *list = NULL; Eina_List *list = NULL;
Eina_List *theme_list = NULL;
char *dir;
Eina_Iterator *it; Eina_Iterator *it;
Efreet_Icon_Theme *theme;
/* update the list to include all icon themes */ /* update the list to include all icon themes */
efreet_icon_theme_dir_scan_all(NULL); efreet_icon_theme_dir_scan_all(NULL);
/* create the list for the user */ /* create the list for the user */
it = eina_hash_iterator_key_new(efreet_icon_themes); it = eina_hash_iterator_data_new(efreet_icon_themes);
eina_iterator_foreach(it, EINA_EACH_CB(_hash_keys), &theme_list); EINA_ITERATOR_FOREACH(it, theme)
eina_iterator_free(it);
EINA_LIST_FREE(theme_list, dir)
{ {
Efreet_Icon_Theme *theme;
theme = eina_hash_find(efreet_icon_themes, dir);
if (theme->hidden || !theme->valid) continue; if (theme->hidden || !theme->valid) continue;
#ifndef STRICT_SPEC #ifndef STRICT_SPEC
if (!theme->name.name) continue; if (!theme->name.name) continue;
@ -319,6 +306,7 @@ efreet_icon_theme_list_get(void)
list = eina_list_append(list, theme); list = eina_list_append(list, theme);
} }
eina_iterator_free(it);
return list; return list;
} }