[EGIT] [core/enlightenment] master 02/03: try hicolor icon theme as fallback for fdo icon setting if user's theme fails

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=9887db64e8984f878bed21f081f444d618f9b126

commit 9887db64e8984f878bed21f081f444d618f9b126
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 30 12:32:31 2015 -0400

    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 5fc446a..bf7e7ba 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);

--