From af2471c7bc327e778356ff3b0089816fe83662a4 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 15 May 2010 17:55:41 +0000 Subject: [PATCH] remove svg from default types. make efreet_icon_extensions prepended a type when it already is in list SVN revision: 48895 --- legacy/efreet/src/lib/efreet_icon.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c index 6458d4ace7..e0b819d05a 100644 --- a/legacy/efreet/src/lib/efreet_icon.c +++ b/legacy/efreet/src/lib/efreet_icon.c @@ -115,10 +115,7 @@ efreet_icon_init(void) { if (!efreet_icon_themes) { - /* FIXME when svg and xpm with same name exist but svg - loader was not built xpm icon will not be found. - use sth like #ifdef EVAS_IMAGE_LOADER_SVG when possible. */ - const char *default_exts[] = {".png", ".svg", ".xpm", NULL}; + const char *default_exts[] = {".png", ".xpm", NULL}; int i; if (!ecore_init()) @@ -209,7 +206,17 @@ efreet_icon_user_dir_get(void) EAPI void efreet_icon_extension_add(const char *ext) { - efreet_icon_extensions = eina_list_prepend(efreet_icon_extensions, eina_stringshare_add(ext)); + Eina_List *l; + + ext = eina_stringshare_add(ext); + + if ((l = eina_list_data_find_list(efreet_icon_extensions, ext))) + { + eina_stringshare_del((const char *)l->data); + efreet_icon_extensions = eina_list_remove_list(efreet_icon_extensions, l); + } + + efreet_icon_extensions = eina_list_prepend(efreet_icon_extensions, ext); } /**