[EGIT] [core/efl] master 01/01: Switch to eo_del() where it should be a del and not an unref

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=aa6b53a2ae4482d2e2fe51fc636f9538d92f1878

commit aa6b53a2ae4482d2e2fe51fc636f9538d92f1878
Author: Tom Hacohen <t...@stosb.com>
Date:   Wed Jun 1 19:21:08 2016 +0100

    Switch to eo_del() where it should be a del and not an unref
    
    This code was written when eo_del() was removed and eo_unref() was the
    recommended practice. Since we added eo_del() back we now need to adjust
    this new code accordingly.
---
 src/lib/ecore_evas/ecore_evas.c         | 8 ++++----
 src/lib/elementary/elm_part_helper.h    | 2 +-
 src/lib/evas/canvas/efl_event_pointer.c | 2 +-
 3 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 db13c1e..aecbe4e 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4369,7 +4369,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const 
Ecore_Event_Mouse_Button *info, Efl_P
 
    eo_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_unref(evt);
+   eo_del(evt);
 
    return processed;
 }
@@ -4425,7 +4425,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const 
Ecore_Event_Mouse_Move *info)
 
    eo_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_unref(evt);
+   eo_del(evt);
 
    return processed;
 }
@@ -4457,7 +4457,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const 
Ecore_Event_Mouse_Wheel *info)
 
    eo_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_unref(evt);
+   eo_del(evt);
 
    return processed;
 }
@@ -4484,7 +4484,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const 
Ecore_Event_Mouse_IO *info, Efl_Pointe
 
    eo_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_unref(evt);
+   eo_del(evt);
 
    return processed;
 }
diff --git a/src/lib/elementary/elm_part_helper.h 
b/src/lib/elementary/elm_part_helper.h
index b20af6b..a358bdc 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -7,7 +7,7 @@
 #define ELM_PART_HOOK
 
 #define ELM_PART_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
-#define ELM_PART_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) 
eo_unref(obj); } } while(0)
+#define ELM_PART_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) 
eo_del(obj); } } while(0)
 #define ELM_PART_RETURN_VAL(a) do { ELM_PART_HOOK; typeof(a) _ret = a; 
ELM_PART_UNREF(obj, pd); return _ret; } while(0)
 #define ELM_PART_RETURN_VOID do { ELM_PART_HOOK; ELM_PART_UNREF(obj, pd); 
return; } while(0)
 #define ELM_PART_CALL(a) ({ ELM_PART_REF(obj, pd); a; })
diff --git a/src/lib/evas/canvas/efl_event_pointer.c 
b/src/lib/evas/canvas/efl_event_pointer.c
index 213fa77..09adeef 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -37,7 +37,7 @@ _del_hook(Eo *evt)
    else
      {
         eo_del_intercept_set(evt, NULL);
-        eo_unref(evt);
+        eo_del(evt);
      }
 }
 

--