From 9887db64e8984f878bed21f081f444d618f9b126 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 30 Apr 2015 12:32:31 -0400 Subject: [PATCH] try hicolor icon theme as fallback for fdo icon setting if user's theme fails fix T2142 --- src/bin/e_icon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c index 5fc446add..bf7e7ba0d 100644 --- a/src/bin/e_icon.c +++ b/src/bin/e_icon.c @@ -447,7 +447,12 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon) if (!sd->fdo) return EINA_FALSE; path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size); - if (!path) return EINA_FALSE; + if (!path) + { + if (e_util_strcmp(e_config->icon_theme, "hicolor")) + path = efreet_icon_path_find("hicolor", sd->fdo, sd->size); + if (!path) return EINA_FALSE; + } len = strlen(icon); if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj"))) @@ -908,7 +913,13 @@ _e_icon_fdo_reload(void *data) sd->fdo_reload_timer = NULL; sd->size = MAX(sd->w, sd->h); path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size); - if (!path) return EINA_FALSE; + if (!path) + { + if (e_util_strcmp(e_config->icon_theme, "hicolor")) + path = efreet_icon_path_find("hicolor", sd->fdo, sd->size); + if (!path) return EINA_FALSE; + } + /* smart code here */ evas_object_image_load_size_set(sd->obj, sd->size, sd->size);