bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=f54f2183c5ca220a5355de5bba43f24ff97c4b31
commit f54f2183c5ca220a5355de5bba43f24ff97c4b31 Author: Marcel Hollerbach <[email protected]> Date: Sat May 17 17:05:17 2014 +0200 entrance: let the config select the correct icon --- src/bin/entrance_conf_user.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/entrance_conf_user.c b/src/bin/entrance_conf_user.c index 68481f5..d730a07 100644 --- a/src/bin/entrance_conf_user.c +++ b/src/bin/entrance_conf_user.c @@ -82,16 +82,20 @@ _entrance_conf_user_icon_fill_cb(void *data, Elm_Object_Item *it) { Entrance_Conf_Background *cbg; const char *bg_path, *bg_group; + Eina_Bool tmp_icon; cbg = data; + tmp_icon = _entrance_int_conf_user->orig->tmp_icon; bg_path = _entrance_int_conf_user->orig->image.path; bg_group = _entrance_int_conf_user->orig->image.group; if (((cbg->path) && (bg_path) - && (!strcmp(cbg->path, bg_path))) || - ((!cbg->path) && (!bg_path))) + && (!strcmp(cbg->path, bg_path)) && !tmp_icon) + || ((!cbg->path) && (!bg_path)) + || ((!cbg->path) && tmp_icon)) { if (((cbg->group) && (bg_group) - && (!strcmp(cbg->group, bg_group))) || - ((!cbg->group) && (!bg_group))) + && (!strcmp(cbg->group, bg_group)) && !tmp_icon) + ||((!cbg->group) && (!bg_group)) + ||((!cbg->group) && tmp_icon)) { elm_gengrid_item_selected_set(it, EINA_TRUE); return EINA_TRUE; --
