aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 11:04:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 15:13:40 +0900
commit062145b605acdc05a6f37599e97d391f11d9fcc3 (patch)
treed5ba87dce25859f0648b378174cce2014d1642bc /src/lib/elementary/efl_ui_win.c
parentevas events: Properly signal to clients which values are set (diff)
downloadefl-062145b605acdc05a6f37599e97d391f11d9fcc3.tar.gz
win: Fix ERR message with object,focus,in
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.
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 76d0762e4e..2c842499a8 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -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);
}