win: Fix ERR message with object,focus,in
authorJean-Philippe Andre <jp.andre@samsung.com>
Tue, 30 Aug 2016 02:04:31 +0000 (11:04 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Tue, 30 Aug 2016 06:13:40 +0000 (15:13 +0900)
enventor exhibits this issue, where the focus target is
NULL in some cases. The ERR message was harmless, but it's
good to avoid it and be explicit that the object should be
non NULL when adding event callbacks.

src/lib/elementary/efl_ui_win.c

index 76d0762..2c84249 100644 (file)
@@ -2308,13 +2308,16 @@ _elm_win_object_focus_in(void *data,
 
    target = _elm_win_focus_target_get(obj);
    sd->focus_highlight.cur.target = target;
-   if (target && elm_widget_highlight_in_theme_get(target))
-     sd->focus_highlight.cur.in_theme = EINA_TRUE;
-   else
-     _elm_win_focus_target_callbacks_add(sd);
 
-   evas_object_event_callback_add
-     (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj);
+   if (target)
+     {
+        if (elm_widget_highlight_in_theme_get(target))
+          sd->focus_highlight.cur.in_theme = EINA_TRUE;
+        else
+          _elm_win_focus_target_callbacks_add(sd);
+        evas_object_event_callback_add
+              (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj);
+     }
 
    _elm_win_focus_highlight_reconfigure_job_start(sd);
 }