discomfitor pushed a commit to branch enlightenment-0.22.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f10e7ece19d09cc240bdf60a29c17de2a356c877
commit f10e7ece19d09cc240bdf60a29c17de2a356c877
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon Jan 8 10:23:54 2018 -0500
simplify icon suffix detection in vkbd module
CID 1132746, 1132747
---
src/modules/vkbd/e_kbd_int.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/modules/vkbd/e_kbd_int.c b/src/modules/vkbd/e_kbd_int.c
index 5fbe6856e..277470494 100644
--- a/src/modules/vkbd/e_kbd_int.c
+++ b/src/modules/vkbd/e_kbd_int.c
@@ -175,12 +175,10 @@ _e_kbd_int_layout_state_update(E_Kbd_Int *ki)
if (st->icon)
{
char buf[PATH_MAX];
- char *p;
snprintf(buf, sizeof(buf), "%s/%s",
ki->layout.directory, st->icon);
- p = strrchr(st->icon, '.');
- if (!strcmp(p, ".edj"))
+ if (eina_str_has_extension(st->icon, ".edj"))
e_icon_file_edje_set(ky->icon_obj, buf, "icon");
else
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")) ||
(!strcmp(str, "capslock")) || (!strcmp(str, "altgr")))
{
- char *p;
char label[4096];
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, "capslock")) st->state = CAPSLOCK;
if (!strcmp(str, "altgr")) st->state = ALTGR;
- p = strrchr(label, '.');
- if ((p) && (!strcmp(p, ".png")))
- st->icon = eina_stringshare_add(label);
- else if ((p) && (!strcmp(p, ".edj")))
+ if (eina_str_has_extension(label, ".png") ||
eina_str_has_extension(label, ".edj"))
st->icon = eina_stringshare_add(label);
else
st->label = eina_stringshare_add(label);
--
