ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3d0eff2199c3fa108ebb25e08c568cb450dacedc
commit 3d0eff2199c3fa108ebb25e08c568cb450dacedc Author: Andy Williams <a...@andywilliams.me> Date: Thu Apr 28 10:27:56 2016 +0100 elementary: Don't force elm theme over fdo icons Make sure we don't mmap icons if we're using external sources --- src/lib/elementary/elm_theme.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c index 4b357d3..d3a2f35 100644 --- a/src/lib/elementary/elm_theme.c +++ b/src/lib/elementary/elm_theme.c @@ -358,6 +358,13 @@ _elm_theme_icon_set(Elm_Theme *th, char buf2[1024]; int w, h; + if (eo_isa((o), ELM_ICON_CLASS) && elm_icon_standard_get(o) && + strcmp(elm_config_icon_theme_get(), ELM_CONFIG_ICON_THEME_ELEMENTARY)) + { + elm_icon_standard_set(o, elm_icon_standard_get(o)); + return EINA_TRUE; + } + if (!th) th = &(theme_default); snprintf(buf2, sizeof(buf2), "elm/icon/%s/%s", group, style); file = _elm_theme_group_file_find(th, buf2); --