enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

simplify icon suffix detection in vkbd module 

CID 1132746, 1132747
This commit is contained in:
Mike Blumenkrantz 2018-01-08 10:23:54 -05:00
parent 67ad5c81a5
commit f10e7ece19
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/vkbd/e_kbd_int.c
View File

@ -175,12 +175,10 @@ _e_kbd_int_layout_state_update(E_Kbd_Int *ki)
if (st->icon) if (st->icon)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
char *p;
snprintf(buf, sizeof(buf), "%s/%s", snprintf(buf, sizeof(buf), "%s/%s",
ki->layout.directory, st->icon); ki->layout.directory, st->icon);
p = strrchr(st->icon, '.'); if (eina_str_has_extension(st->icon, ".edj"))
if (!strcmp(p, ".edj"))
e_icon_file_edje_set(ky->icon_obj, buf, "icon"); e_icon_file_edje_set(ky->icon_obj, buf, "icon");
else else
e_icon_file_set(ky->icon_obj, buf); e_icon_file_set(ky->icon_obj, buf);
@ -975,7 +973,6 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
if ((!strcmp(str, "normal")) || (!strcmp(str, "shift")) || if ((!strcmp(str, "normal")) || (!strcmp(str, "shift")) ||
(!strcmp(str, "capslock")) || (!strcmp(str, "altgr"))) (!strcmp(str, "capslock")) || (!strcmp(str, "altgr")))
{ {
char *p;
char label[4096]; char label[4096];
if (sscanf(buf, "%*s %4000s", label) != 1) continue; if (sscanf(buf, "%*s %4000s", label) != 1) continue;
@ -986,10 +983,7 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
if (!strcmp(str, "shift")) st->state = SHIFT; if (!strcmp(str, "shift")) st->state = SHIFT;
if (!strcmp(str, "capslock")) st->state = CAPSLOCK; if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
if (!strcmp(str, "altgr")) st->state = ALTGR; if (!strcmp(str, "altgr")) st->state = ALTGR;
p = strrchr(label, '.'); if (eina_str_has_extension(label, ".png") || eina_str_has_extension(label, ".edj"))
if ((p) && (!strcmp(p, ".png")))
st->icon = eina_stringshare_add(label);
else if ((p) && (!strcmp(p, ".edj")))
st->icon = eina_stringshare_add(label); st->icon = eina_stringshare_add(label);
else else
st->label = eina_stringshare_add(label); st->label = eina_stringshare_add(label);