[EGIT] [tools/eflete] master 03/21: shortcuts: avoid the NULL in strcmp

[Vyacheslav Reutskiy]

nikawhite pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=d68651c029836ff90a80ec95fd6ae4a5498fc2a1

commit d68651c029836ff90a80ec95fd6ae4a5498fc2a1
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Tue Aug 9 17:47:45 2016 +0300

    shortcuts: avoid the NULL in strcmp
    
    Fixes T4307
    
    Change-Id: Idefe0966caae02499a461ab0f056a229cff8470d
---
 src/bin/ui/shortcuts/shortcuts.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index abeb5a2..dd395c5 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -233,6 +233,7 @@ _key_press_event_cb(void *data __UNUSED__, int type 
__UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = (Ecore_Event_Key *)event;
    Shortcut sc, *shortcut;
+   const char *obj_name;
 
    /*
     *  (ev->modifiers && 255) because modifiers contain both locks and modifs,
@@ -264,6 +265,7 @@ _key_press_event_cb(void *data __UNUSED__, int type 
__UNUSED__, void *event)
      }
 
    /* ignore hotkey if */
+   obj_name = evas_object_type_get(elm_object_focused_object_get(ap.win));
    if (/* it is without modifier or with shift-only */
       ((sc.modifiers == MOD_NONE) || (sc.modifiers == MOD_SHIFT)) &&
       /* is not F1 - F12 */
@@ -275,7 +277,7 @@ _key_press_event_cb(void *data __UNUSED__, int type 
__UNUSED__, void *event)
          (sc.keycode == 104 /*KP_ENTER*/) ||
          (sc.keycode == 9 /*ESC*/)) ) &&
       /* elm_entry is in focus */
-      (!strcmp("elm_entry", 
evas_object_type_get(elm_object_focused_object_get(ap.win)))))
+      (obj_name ? (!strcmp("elm_entry", obj_name)) : false))
      {
         DBG("entry focused, ignoring hotkeys with MOD_SHIFT or MODE_NONE");
         return ECORE_CALLBACK_PASS_ON;

--