evas: propagate object data to evas_object_inform_call_show instead of fetching it...

diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index c0e8d30..86a5f6c 100644 (file)
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -5,9 +5,8 @@
 /* local calls */
 
 void
-evas_object_inform_call_show(Evas_Object *eo_obj)
+evas_object_inform_call_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 {
-   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int event_id = _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_EVENT_SHOW);

diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 464f657..f4565ed 100644 (file)
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1948,7 +1948,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
           }
      }
    evas_object_update_bounding_box(eo_obj, obj, NULL);
-   evas_object_inform_call_show(eo_obj);
+   evas_object_inform_call_show(eo_obj, obj);
 
    Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW);
    if (event_anim)

diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index dbaf8a1..7fecfef 100644 (file)
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1740,7 +1740,7 @@ void evas_object_event_callback_all_del(Evas_Object *obj);
 void evas_object_event_callback_cleanup(Evas_Object *obj);
 void evas_event_callback_all_del(Evas *e);
 void evas_event_callback_cleanup(Evas *e);
-void evas_object_inform_call_show(Evas_Object *obj);
+void evas_object_inform_call_show(Evas_Object *obj, Evas_Object_Protected_Data *pd);
 void evas_object_inform_call_hide(Evas_Object *obj);
 void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data *pd);
 void evas_object_inform_call_resize(Evas_Object *obj);