[EGIT] [core/elementary] master 01/01: win: set NULL to focus_highlight.prev.target when it's deleted.

[WooHyun Jung]

woohyun pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=44ea0a16efa6012a66be6215cff364cf59a81edc

commit 44ea0a16efa6012a66be6215cff364cf59a81edc
Author: WooHyun Jung <wh0705.j...@samsung.com>
Date:   Fri May 23 11:07:59 2014 +0900

    win: set NULL to focus_highlight.prev.target when it's deleted.
---
 src/lib/elm_win.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 5976315..68e603e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -806,6 +806,16 @@ _elm_win_focus_highlight_simple_setup(Elm_Win_Data *sd,
 }
 
 static void
+_elm_win_focus_prev_target_del(void *data,
+                               Evas *e EINA_UNUSED,
+                               Evas_Object *obj EINA_UNUSED,
+                               void *event_info EINA_UNUSED)
+{
+   ELM_WIN_DATA_GET(data, sd);
+   sd->focus_highlight.prev.target = NULL;
+}
+
+static void
 _elm_win_focus_highlight_reconfigure_job(void *data)
 {
    ELM_WIN_DATA_GET(data, sd);
@@ -829,8 +839,12 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
      return;
 
    if ((previous) && (sd->focus_highlight.prev.in_theme))
-     elm_widget_signal_emit
-       (previous, "elm,action,focus_highlight,hide", "elm");
+     {
+        evas_object_event_callback_del_full
+           (previous, EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data);
+        elm_widget_signal_emit
+           (previous, "elm,action,focus_highlight,hide", "elm");
+     }
 
    if (!target)
      common_visible = EINA_FALSE;
@@ -891,6 +905,9 @@ the_end:
    _elm_win_focus_highlight_visible_set(sd, common_visible);
    sd->focus_highlight.geometry_changed = EINA_FALSE;
    sd->focus_highlight.prev = sd->focus_highlight.cur;
+   evas_object_event_callback_add
+     (sd->focus_highlight.prev.target,
+      EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data);
 }
 
 static void

--