summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-07-26 10:47:40 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-26 14:19:59 +0900
commit3590010003a9900f9c2a2c8b3293952c2dedb7c4 (patch)
treefc7250d8813d9530be79bfefd7f06c41054bd8c8
parent6b68dd5712a65b179835c81b2b3534a23576be63 (diff)
edje: Use eo_del instead of eo_unref where needed
This fixes the following error message: Object '0x40000002f0000030' still has a parent at the time of destruction. Though I actually wonder why ref == 0 and there was a parent. Something is still a bit fishy here.
-rw-r--r--src/lib/edje/edje_containers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index c629245..6b194b2 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -39,7 +39,7 @@ struct _Part_Item_Iterator
39}; 39};
40 40
41#define PROXY_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0) 41#define PROXY_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
42#define PROXY_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) eo_unref(obj); } } while(0) 42#define PROXY_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) eo_del(obj); } } while(0)
43#define RETURN_VAL(a) do { typeof(a) _ret = a; PROXY_UNREF(obj, pd); return _ret; } while(0) 43#define RETURN_VAL(a) do { typeof(a) _ret = a; PROXY_UNREF(obj, pd); return _ret; } while(0)
44#define RETURN_VOID do { PROXY_UNREF(obj, pd); return; } while(0) 44#define RETURN_VOID do { PROXY_UNREF(obj, pd); return; } while(0)
45#define PROXY_CALL(a) ({ PROXY_REF(obj, pd); a; }) 45#define PROXY_CALL(a) ({ PROXY_REF(obj, pd); a; })
@@ -50,7 +50,7 @@ struct _Part_Item_Iterator
50 do { if (_ ## type ## _proxy) \ 50 do { if (_ ## type ## _proxy) \
51 { \ 51 { \
52 eo_del_intercept_set(_ ## type ## _proxy, NULL); \ 52 eo_del_intercept_set(_ ## type ## _proxy, NULL); \
53 eo_unref(_ ## type ## _proxy); \ 53 eo_del(_ ## type ## _proxy); \
54 _ ## type ## _proxy = NULL; \ 54 _ ## type ## _proxy = NULL; \
55 } } while (0) 55 } } while (0)
56 56
@@ -61,7 +61,7 @@ type ## _del_cb(Eo *proxy) \
61 if (_ ## type ## _proxy) \ 61 if (_ ## type ## _proxy) \
62 { \ 62 { \
63 eo_del_intercept_set(proxy, NULL); \ 63 eo_del_intercept_set(proxy, NULL); \
64 eo_unref(proxy); \ 64 eo_del(proxy); \
65 return; \ 65 return; \
66 } \ 66 } \
67 if (eo_parent_get(proxy)) \ 67 if (eo_parent_get(proxy)) \