summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore/efl_model_accessor_view.c2
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c5
-rw-r--r--src/lib/ecore_evas/ecore_evas.c2
-rw-r--r--src/lib/edje/edje_part_helper.h2
-rw-r--r--src/lib/evas/canvas/efl_input_focus.c7
-rw-r--r--src/lib/evas/canvas/efl_input_key.c7
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c7
-rw-r--r--src/lib/evas/canvas/evas_events.c42
-rw-r--r--src/lib/evas/filters/evas_filter.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c4
10 files changed, 45 insertions, 35 deletions
diff --git a/src/lib/ecore/efl_model_accessor_view.c b/src/lib/ecore/efl_model_accessor_view.c
index 2afe1dc8f3..a73e9459a5 100644
--- a/src/lib/ecore/efl_model_accessor_view.c
+++ b/src/lib/ecore/efl_model_accessor_view.c
@@ -68,7 +68,7 @@ _efl_model_acessor_free(Efl_Model_Accessor *acc)
68 68
69 EINA_ARRAY_ITER_NEXT(acc->children, i, item, iterator) 69 EINA_ARRAY_ITER_NEXT(acc->children, i, item, iterator)
70 { 70 {
71 efl_del(item); 71 efl_unref(item);
72 } 72 }
73 eina_array_free(acc->children); 73 eina_array_free(acc->children);
74 acc->children = NULL; 74 acc->children = NULL;
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index ecdb187761..8b5055589c 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -277,12 +277,13 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
277 277
278 if (cl->socket) 278 if (cl->socket)
279 { 279 {
280 Eo *inner_socket = efl_io_buffered_stream_inner_io_get(cl->socket); 280 Eo *parent, *inner_socket = efl_io_buffered_stream_inner_io_get(cl->socket);
281 efl_event_callback_array_del(cl->socket, _ecore_con_client_socket_cbs(), cl); 281 efl_event_callback_array_del(cl->socket, _ecore_con_client_socket_cbs(), cl);
282 if (efl_isa(inner_socket, EFL_NET_SOCKET_SSL_CLASS)) 282 if (efl_isa(inner_socket, EFL_NET_SOCKET_SSL_CLASS))
283 efl_event_callback_array_del(inner_socket, _ecore_con_client_socket_ssl_cbs(), cl); 283 efl_event_callback_array_del(inner_socket, _ecore_con_client_socket_ssl_cbs(), cl);
284 284
285 if (efl_parent_get(cl->socket) != cl->svr->server) 285 parent = efl_parent_get(cl->socket);
286 if (parent && (parent != cl->svr->server))
286 efl_del(cl->socket); /* we own it */ 287 efl_del(cl->socket); /* we own it */
287 else 288 else
288 efl_unref(cl->socket); 289 efl_unref(cl->socket);
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 4348da8084..f20bd0b9aa 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4695,7 +4695,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4695 4695
4696 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4696 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4697 processed = ev->evas_done; 4697 processed = ev->evas_done;
4698 efl_del(evt); 4698 efl_unref(evt);
4699 4699
4700 return processed; 4700 return processed;
4701} 4701}
diff --git a/src/lib/edje/edje_part_helper.h b/src/lib/edje/edje_part_helper.h
index 0af166aef7..cfe31e7eb1 100644
--- a/src/lib/edje/edje_part_helper.h
+++ b/src/lib/edje/edje_part_helper.h
@@ -52,7 +52,7 @@ _part_proxy_del_cb(Eo *proxy, Eo **static_var)
52 do { if (PROXY_STATIC_VAR(type)) \ 52 do { if (PROXY_STATIC_VAR(type)) \
53 { \ 53 { \
54 efl_del_intercept_set(PROXY_STATIC_VAR(type), NULL); \ 54 efl_del_intercept_set(PROXY_STATIC_VAR(type), NULL); \
55 efl_del(PROXY_STATIC_VAR(type)); \ 55 efl_unref(PROXY_STATIC_VAR(type)); \
56 PROXY_STATIC_VAR(type) = NULL; \ 56 PROXY_STATIC_VAR(type) = NULL; \
57 } } while (0) 57 } } while (0)
58 58
diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c
index abf1c735ae..239b5309b3 100644
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -32,7 +32,7 @@ _del_hook(Eo *evt)
32 else 32 else
33 { 33 {
34 efl_del_intercept_set(evt, NULL); 34 efl_del_intercept_set(evt, NULL);
35 efl_del(evt); 35 efl_unref(evt);
36 } 36 }
37} 37}
38 38
@@ -64,7 +64,10 @@ _efl_input_focus_class_destructor(Efl_Class *klass EINA_UNUSED)
64{ 64{
65 // this is a strange situation... 65 // this is a strange situation...
66 efl_del_intercept_set(s_cached_event, NULL); 66 efl_del_intercept_set(s_cached_event, NULL);
67 efl_del(s_cached_event); 67 if (efl_parent_get(s_cached_event))
68 efl_del(s_cached_event);
69 else
70 efl_unref(s_cached_event);
68 s_cached_event = NULL; 71 s_cached_event = NULL;
69} 72}
70 73
diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index c6b8061211..c2cff2add5 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -31,7 +31,7 @@ _del_hook(Eo *evt)
31 else 31 else
32 { 32 {
33 efl_del_intercept_set(evt, NULL); 33 efl_del_intercept_set(evt, NULL);
34 efl_del(evt); 34 efl_unref(evt);
35 } 35 }
36} 36}
37 37
@@ -75,7 +75,10 @@ _efl_input_key_class_destructor(Efl_Class *klass EINA_UNUSED)
75{ 75{
76 // this is a strange situation... 76 // this is a strange situation...
77 efl_del_intercept_set(s_cached_event, NULL); 77 efl_del_intercept_set(s_cached_event, NULL);
78 efl_del(s_cached_event); 78 if (efl_parent_get(s_cached_event))
79 efl_del(s_cached_event);
80 else
81 efl_unref(s_cached_event);
79 s_cached_event = NULL; 82 s_cached_event = NULL;
80} 83}
81 84
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 282ffeaf8d..d2e565f2a7 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -42,7 +42,7 @@ _del_hook(Eo *evt)
42 else 42 else
43 { 43 {
44 efl_del_intercept_set(evt, NULL); 44 efl_del_intercept_set(evt, NULL);
45 efl_del(evt); 45 efl_unref(evt);
46 } 46 }
47} 47}
48 48
@@ -105,7 +105,10 @@ _efl_input_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
105{ 105{
106 // this is a strange situation... 106 // this is a strange situation...
107 efl_del_intercept_set(s_cached_event, NULL); 107 efl_del_intercept_set(s_cached_event, NULL);
108 efl_del(s_cached_event); 108 if (efl_parent_get(s_cached_event))
109 efl_del(s_cached_event);
110 else
111 efl_unref(s_cached_event);
109 s_cached_event = NULL; 112 s_cached_event = NULL;
110} 113}
111 114
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 148ac173bc..71eb04682a 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -551,7 +551,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
551 } 551 }
552 eina_list_free(copy); 552 eina_list_free(copy);
553 553
554 efl_del(evt); 554 efl_unref(evt);
555} 555}
556 556
557static void 557static void
@@ -765,7 +765,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
765 } 765 }
766 } 766 }
767 767
768 efl_del(evt); 768 efl_unref(evt);
769} 769}
770 770
771static void 771static void
@@ -833,7 +833,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
833 } 833 }
834 eina_list_free(copy); 834 eina_list_free(copy);
835 835
836 efl_del(evt); 836 efl_unref(evt);
837} 837}
838 838
839static void 839static void
@@ -915,7 +915,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
915 } 915 }
916 eina_list_free(copy); 916 eina_list_free(copy);
917 917
918 efl_del(evt); 918 efl_unref(evt);
919} 919}
920 920
921static void 921static void
@@ -983,7 +983,7 @@ _evas_event_source_multi_down_events(Evas_Object_Protected_Data *obj, Evas_Publi
983 } 983 }
984 eina_list_free(copy); 984 eina_list_free(copy);
985 985
986 efl_del(evt); 986 efl_unref(evt);
987} 987}
988 988
989static void 989static void
@@ -1041,7 +1041,7 @@ _evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_
1041 } 1041 }
1042 eina_list_free(copy); 1042 eina_list_free(copy);
1043 1043
1044 efl_del(evt); 1044 efl_unref(evt);
1045} 1045}
1046 1046
1047static void 1047static void
@@ -1156,7 +1156,7 @@ _evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Publi
1156 eina_list_free(ins); 1156 eina_list_free(ins);
1157 } 1157 }
1158 1158
1159 efl_del(evt); 1159 efl_unref(evt);
1160} 1160}
1161 1161
1162static void 1162static void
@@ -1246,7 +1246,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
1246 } 1246 }
1247 EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_write); 1247 EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_write);
1248 1248
1249 efl_del(evt); 1249 efl_unref(evt);
1250} 1250}
1251 1251
1252static void 1252static void
@@ -1307,7 +1307,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
1307 proxy_write->src_event_in = eina_list_free(proxy_write->src_event_in); 1307 proxy_write->src_event_in = eina_list_free(proxy_write->src_event_in);
1308 EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_write); 1308 EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_write);
1309 1309
1310 efl_del(evt); 1310 efl_unref(evt);
1311} 1311}
1312 1312
1313static Eina_List * 1313static Eina_List *
@@ -1701,7 +1701,7 @@ _post_up_handle(Evas_Public_Data *e, Efl_Input_Pointer *parent_ev,
1701 if (pdata->seat->inside) 1701 if (pdata->seat->inside)
1702 _evas_canvas_event_pointer_move_event_dispatch(e, pdata, ev->data); 1702 _evas_canvas_event_pointer_move_event_dispatch(e, pdata, ev->data);
1703 1703
1704 efl_del(evt); 1704 efl_unref(evt);
1705} 1705}
1706 1706
1707static void 1707static void
@@ -1850,7 +1850,7 @@ _canvas_event_feed_mouse_updown(Eo *eo_e, int b, Evas_Button_Flags flags,
1850 else 1850 else
1851 _canvas_event_feed_mouse_up_internal(e, ev); 1851 _canvas_event_feed_mouse_up_internal(e, ev);
1852 1852
1853 efl_del(evt); 1853 efl_unref(evt);
1854} 1854}
1855 1855
1856static void 1856static void
@@ -1952,7 +1952,7 @@ evas_event_feed_mouse_cancel(Eo *eo_e, unsigned int timestamp, const void *data)
1952 1952
1953 _canvas_event_feed_mouse_cancel_internal(e, ev); 1953 _canvas_event_feed_mouse_cancel_internal(e, ev);
1954 1954
1955 efl_del(evt); 1955 efl_unref(evt);
1956} 1956}
1957 1957
1958static void 1958static void
@@ -2024,7 +2024,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Input_Pointer_Data *pe)
2024 eina_list_free(copy); 2024 eina_list_free(copy);
2025 _evas_post_event_callback_call(eo_e, e, event_id); 2025 _evas_post_event_callback_call(eo_e, e, event_id);
2026 2026
2027 efl_del(evt); 2027 efl_unref(evt);
2028 _evas_unwalk(e); 2028 _evas_unwalk(e);
2029} 2029}
2030 2030
@@ -2044,7 +2044,7 @@ evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timesta
2044 ev->device = efl_ref(_evas_event_legacy_device_get(eo_e, EINA_TRUE)); 2044 ev->device = efl_ref(_evas_event_legacy_device_get(eo_e, EINA_TRUE));
2045 2045
2046 _canvas_event_feed_mouse_wheel_internal(eo_e, ev); 2046 _canvas_event_feed_mouse_wheel_internal(eo_e, ev);
2047 efl_del(evt); 2047 efl_unref(evt);
2048} 2048}
2049 2049
2050static void 2050static void
@@ -2485,7 +2485,7 @@ _canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int
2485 2485
2486 _canvas_event_feed_mouse_move_internal(e, ev); 2486 _canvas_event_feed_mouse_move_internal(e, ev);
2487 2487
2488 efl_del(evt); 2488 efl_unref(evt);
2489} 2489}
2490 2490
2491EAPI void 2491EAPI void
@@ -2713,7 +2713,7 @@ _canvas_event_feed_mouse_inout_legacy(Eo *eo_e, unsigned int timestamp,
2713 else 2713 else
2714 _canvas_event_feed_mouse_out_internal(eo_e, ev); 2714 _canvas_event_feed_mouse_out_internal(eo_e, ev);
2715 2715
2716 efl_del(evt); 2716 efl_unref(evt);
2717} 2717}
2718 2718
2719EAPI void 2719EAPI void
@@ -2961,7 +2961,7 @@ _canvas_event_feed_multi_internal(Evas *eo_e, Evas_Public_Data *e,
2961 default: break; 2961 default: break;
2962 } 2962 }
2963 2963
2964 efl_del(evt); 2964 efl_unref(evt);
2965} 2965}
2966 2966
2967EAPI void 2967EAPI void
@@ -3414,7 +3414,7 @@ _canvas_event_feed_key_legacy(Eo *eo_e, Evas_Public_Data *e,
3414 else 3414 else
3415 _canvas_event_feed_key_up_internal(e, ev); 3415 _canvas_event_feed_key_up_internal(e, ev);
3416 3416
3417 efl_del(evt); 3417 efl_unref(evt);
3418} 3418}
3419 3419
3420EAPI void 3420EAPI void
@@ -3502,7 +3502,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
3502 _evas_unwalk(e); 3502 _evas_unwalk(e);
3503 _evas_object_event_new(); 3503 _evas_object_event_new();
3504 3504
3505 efl_del(evt); 3505 efl_unref(evt);
3506} 3506}
3507 3507
3508void 3508void
@@ -3671,7 +3671,7 @@ evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int
3671 3671
3672 _canvas_event_feed_axis_update_internal(e, ev); 3672 _canvas_event_feed_axis_update_internal(e, ev);
3673 3673
3674 efl_del(evt); 3674 efl_unref(evt);
3675} 3675}
3676 3676
3677static void 3677static void
@@ -4194,7 +4194,7 @@ _evas_canvas_event_pointer_move_event_dispatch(Evas_Public_Data *edata,
4194 4194
4195 _canvas_event_feed_mouse_move_internal(edata, ev); 4195 _canvas_event_feed_mouse_move_internal(edata, ev);
4196 4196
4197 efl_del(evt); 4197 efl_unref(evt);
4198} 4198}
4199 4199
4200void 4200void
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index 135d20b2bc..fcbad016f2 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -116,7 +116,7 @@ static void
116_filter_buffer_backing_free(Evas_Filter_Buffer *fb) 116_filter_buffer_backing_free(Evas_Filter_Buffer *fb)
117{ 117{
118 if (!fb || !fb->buffer) return; 118 if (!fb || !fb->buffer) return;
119 efl_del(fb->buffer); 119 efl_unref(fb->buffer);
120 fb->buffer = NULL; 120 fb->buffer = NULL;
121} 121}
122 122
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 169db5b889..a9cba7d449 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -656,7 +656,7 @@ START_TEST(efl_refs)
656 fail_if(!efl_invalidated_get(obj3)); 656 fail_if(!efl_invalidated_get(obj3));
657 657
658 efl_unref(obj); 658 efl_unref(obj);
659 efl_del(obj2); 659 efl_unref(obj2);
660 efl_unref(obj3); 660 efl_unref(obj3);
661 661
662 /* Setting and removing parents for add_ref */ 662 /* Setting and removing parents for add_ref */
@@ -681,7 +681,7 @@ START_TEST(efl_refs)
681 fail_if(!efl_invalidated_get(obj3)); 681 fail_if(!efl_invalidated_get(obj3));
682 682
683 efl_unref(obj); 683 efl_unref(obj);
684 efl_del(obj2); 684 efl_unref(obj2);
685 efl_unref(obj3); 685 efl_unref(obj3);
686 686
687 /* Just check it doesn't seg atm. */ 687 /* Just check it doesn't seg atm. */