diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2018-04-11 10:38:21 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-05-24 16:02:17 -0700 |
commit | ccb5642eb9c122deac271da5f8b1353f46d73160 (patch) | |
tree | 9a0a93692425677f4853a6f1b8dadd6ee430c5ec /src/lib/ecore_evas | |
parent | 36f8a70041a8a16249a07d5b7131d57a8a6ea95b (diff) |
Revert "efl_add_ref - fis to use efl_add properly with a parent."
This reverts commit 2fb5cc3ad09f6aaf82b5d1131ac5ed22ed848bd4.
Most of this change where wrong as they didn't affect the destruction
of the object. efl_add_ref allow for manual handling of the lifecycle
of the object and make sure it is still alive during destructor. efl_add
will not allow you to access an object after invalidate also efl.parent.get
will always return NULL once the object is invalidated.
Differential Revision: https://phab.enlightenment.org/D6062
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index da3401a286..fc0b830643 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -3511,7 +3511,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee, | |||
3511 | 3511 | ||
3512 | efl_event_callback_legacy_call(ee->evas, | 3512 | efl_event_callback_legacy_call(ee->evas, |
3513 | _event_description_get(ev->action), evt); | 3513 | _event_description_get(ev->action), evt); |
3514 | efl_unref(evt); | 3514 | efl_del(evt); |
3515 | } | 3515 | } |
3516 | 3516 | ||
3517 | EAPI void | 3517 | EAPI void |
@@ -4729,7 +4729,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info) | |||
4729 | 4729 | ||
4730 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); | 4730 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); |
4731 | processed = ev->evas_done; | 4731 | processed = ev->evas_done; |
4732 | efl_unref(evt); | 4732 | efl_del(evt); |
4733 | 4733 | ||
4734 | return processed; | 4734 | return processed; |
4735 | } | 4735 | } |
@@ -4764,7 +4764,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info) | |||
4764 | 4764 | ||
4765 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); | 4765 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); |
4766 | processed = ev->evas_done; | 4766 | processed = ev->evas_done; |
4767 | efl_unref(evt); | 4767 | efl_del(evt); |
4768 | 4768 | ||
4769 | return processed; | 4769 | return processed; |
4770 | } | 4770 | } |
@@ -4794,7 +4794,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe | |||
4794 | 4794 | ||
4795 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); | 4795 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); |
4796 | processed = ev->evas_done; | 4796 | processed = ev->evas_done; |
4797 | efl_unref(evt); | 4797 | efl_del(evt); |
4798 | 4798 | ||
4799 | return processed; | 4799 | return processed; |
4800 | } | 4800 | } |
@@ -4924,7 +4924,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info) | |||
4924 | 4924 | ||
4925 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); | 4925 | efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); |
4926 | processed = ev->evas_done; | 4926 | processed = ev->evas_done; |
4927 | efl_unref(evt); | 4927 | efl_del(evt); |
4928 | 4928 | ||
4929 | return processed; | 4929 | return processed; |
4930 | } | 4930 | } |
@@ -4966,7 +4966,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow | |||
4966 | efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt); | 4966 | efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt); |
4967 | 4967 | ||
4968 | processed = ev->evas_done; | 4968 | processed = ev->evas_done; |
4969 | efl_unref(evt); | 4969 | efl_del(evt); |
4970 | 4970 | ||
4971 | return processed; | 4971 | return processed; |
4972 | } | 4972 | } |