summaryrefslogtreecommitdiff
path: root/src/tests/edje/edje_test_edje.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-17 16:08:28 +0100
committerTom Hacohen <tom@stosb.com>2016-05-17 16:23:23 +0100
commit546ff7bbba788ec834c5608361c0834853f2d5d7 (patch)
tree72f867c3bbb79d0684d0bd2bf9785aa859c3ff7b /src/tests/edje/edje_test_edje.c
parente9c4e7bf76513f2a2d110b93b3cced36318b6d14 (diff)
Eo: Remove eo_del() and make eo_unref() the replacement.
We used to have eo_del() as the mirrored action to eo_add(). No longer, now you just always eo_unref() to delete an object. This change makes it so the reference of the parent is shared with the reference the programmer has. So eo_parent_set(obj, NULL) can free an object, and so does eo_unref() (even if there is a parent). This means Eo no longer complains if you have a parent during deletion.
Diffstat (limited to '')
-rw-r--r--src/tests/edje/edje_test_edje.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index bcd36f1385..9e0ddfaf43 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -714,7 +714,7 @@ START_TEST(edje_test_table_eoapi)
714 714
715 i = eo_ref_get(table); 715 i = eo_ref_get(table);
716 fail_if(i != 1); 716 fail_if(i != 1);
717 eo_del(table); 717 eo_unref(table);
718 718
719 /* this will generate eo errors */ 719 /* this will generate eo errors */
720 k = eo_ref_get(table); 720 k = eo_ref_get(table);
@@ -733,7 +733,7 @@ START_TEST(edje_test_table_eoapi)
733 fail_if(eo_ref_get(other) != 1); 733 fail_if(eo_ref_get(other) != 1);
734 734
735 /* delete edje and verify proxy died */ 735 /* delete edje and verify proxy died */
736 eo_del(obj); 736 eo_unref(obj);
737 737
738 /* this will generate eo errors */ 738 /* this will generate eo errors */
739 fail_if(eo_ref_get(table) > 0); 739 fail_if(eo_ref_get(table) > 0);
@@ -752,7 +752,7 @@ START_TEST(edje_test_table_eoapi)
752 fail_if(!table); 752 fail_if(!table);
753 eo_ref(table); 753 eo_ref(table);
754 fflush(stderr); 754 fflush(stderr);
755 eo_del(obj); 755 eo_unref(obj);
756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */ 756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */
757 fail_if(eo_ref_get(table) > 1); 757 fail_if(eo_ref_get(table) > 1);
758 758