summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore_anim.c18
-rw-r--r--src/lib/ecore/ecore_exe.c12
-rw-r--r--src/lib/ecore/ecore_exe_posix.c2
-rw-r--r--src/lib/ecore/ecore_exe_win32.c4
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c12
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c10
-rw-r--r--src/lib/ecore/ecore_idler.c10
-rw-r--r--src/lib/ecore/ecore_job.c10
-rw-r--r--src/lib/ecore/ecore_poller.c13
-rw-r--r--src/lib/ecore/ecore_timer.c24
10 files changed, 56 insertions, 59 deletions
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index a5f4d9d..d54e92f 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -319,7 +319,7 @@ _do_tick(void)
319 eina_inlist_remove(EINA_INLIST_GET(animators), 319 eina_inlist_remove(EINA_INLIST_GET(animators),
320 EINA_INLIST_GET(animator)); 320 EINA_INLIST_GET(animator));
321 321
322 eo_do(animator->obj, eo_parent_set(NULL)); 322 eo_parent_set(animator->obj, NULL);
323 if (eo_destructed_is(animator->obj)) 323 if (eo_destructed_is(animator->obj))
324 eo_manual_free(animator->obj); 324 eo_manual_free(animator->obj);
325 else 325 else
@@ -372,8 +372,7 @@ ecore_animator_add(Ecore_Task_Cb func,
372{ 372{
373 Ecore_Animator *animator = NULL; 373 Ecore_Animator *animator = NULL;
374 374
375 animator = eo_add(MY_CLASS, _ecore_parent, 375 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_constructor(eoid, func, data));
376 ecore_animator_constructor(func, data));
377 return animator; 376 return animator;
378} 377}
379 378
@@ -389,8 +388,7 @@ ecore_animator_timeline_add(double runtime,
389 const void *data) 388 const void *data)
390{ 389{
391 Ecore_Animator *animator; 390 Ecore_Animator *animator;
392 animator = eo_add(MY_CLASS, _ecore_parent, 391 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_timeline_constructor(eoid, runtime, func, data));
393 ecore_animator_timeline_constructor(runtime, func, data));
394 return animator; 392 return animator;
395} 393}
396 394
@@ -682,7 +680,7 @@ _ecore_animator_eo_base_destructor(Eo *obj, Ecore_Animator_Data *pd)
682 pd->delete_me = EINA_TRUE; 680 pd->delete_me = EINA_TRUE;
683 animators_delete_me++; 681 animators_delete_me++;
684 682
685 eo_do_super(obj, MY_CLASS, eo_destructor()); 683 eo_destructor(eo_super(obj, MY_CLASS));
686} 684}
687 685
688EOLIAN static Eo * 686EOLIAN static Eo *
@@ -693,7 +691,7 @@ _ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd)
693 return NULL; 691 return NULL;
694 } 692 }
695 693
696 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 694 return eo_finalize(eo_super(obj, MY_CLASS));
697} 695}
698 696
699EAPI void 697EAPI void
@@ -718,7 +716,7 @@ EAPI void
718ecore_animator_freeze(Ecore_Animator *animator) 716ecore_animator_freeze(Ecore_Animator *animator)
719{ 717{
720 ECORE_ANIMATOR_CHECK(animator); 718 ECORE_ANIMATOR_CHECK(animator);
721 eo_do(animator, eo_event_freeze()); 719 eo_event_freeze(animator);
722} 720}
723 721
724EOLIAN static void 722EOLIAN static void
@@ -738,7 +736,7 @@ EAPI void
738ecore_animator_thaw(Ecore_Animator *animator) 736ecore_animator_thaw(Ecore_Animator *animator)
739{ 737{
740 ECORE_ANIMATOR_CHECK(animator); 738 ECORE_ANIMATOR_CHECK(animator);
741 eo_do(animator, eo_event_thaw()); 739 eo_event_thaw(animator);
742} 740}
743 741
744EOLIAN static void 742EOLIAN static void
@@ -813,7 +811,7 @@ _ecore_animator_shutdown(void)
813 if (animator->suspended) animators_suspended--; 811 if (animator->suspended) animators_suspended--;
814 animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); 812 animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
815 813
816 eo_do(animator->obj, eo_parent_set(NULL)); 814 eo_parent_set(animator->obj, NULL);
817 if (eo_destructed_is(animator->obj)) 815 if (eo_destructed_is(animator->obj))
818 eo_manual_free(animator->obj); 816 eo_manual_free(animator->obj);
819 else 817 else
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index e31f96e..75c577b 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -67,7 +67,7 @@ ecore_exe_pipe_run(const char *exe_cmd,
67 Ecore_Exe_Flags flags, 67 Ecore_Exe_Flags flags,
68 const void *data) 68 const void *data)
69{ 69{
70 Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(exe_cmd, flags)); 70 Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eoid, exe_cmd, flags));
71 if (ret) 71 if (ret)
72 { 72 {
73 Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS); 73 Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS);
@@ -95,7 +95,7 @@ EOLIAN static Eo *
95_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) 95_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
96{ 96{
97 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 97 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
98 eo_do_super(obj, MY_CLASS, obj = eo_finalize()); 98 obj = eo_finalize(eo_super(obj, MY_CLASS));
99 99
100 if (!obj) 100 if (!obj)
101 return obj; 101 return obj;
@@ -216,7 +216,7 @@ ecore_exe_free(Ecore_Exe *obj)
216EOLIAN static void 216EOLIAN static void
217_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe) 217_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
218{ 218{
219 eo_do_super(obj, ECORE_EXE_CLASS, eo_destructor()); 219 eo_destructor(eo_super(obj, ECORE_EXE_CLASS));
220 220
221 _impl_ecore_exe_eo_base_destructor(obj, exe); 221 _impl_ecore_exe_eo_base_destructor(obj, exe);
222} 222}
@@ -247,7 +247,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj)
247 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 247 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
248 const char *ret = NULL; 248 const char *ret = NULL;
249 249
250 eo_do(obj, ecore_obj_exe_command_get(&ret, NULL)); 250 ecore_obj_exe_command_get(obj, &ret, NULL);
251 251
252 return ret; 252 return ret;
253} 253}
@@ -292,13 +292,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj)
292EAPI void 292EAPI void
293ecore_exe_pause(Ecore_Exe *obj) 293ecore_exe_pause(Ecore_Exe *obj)
294{ 294{
295 eo_do(obj, efl_control_suspend_set(EINA_TRUE)); 295 efl_control_suspend_set(obj, EINA_TRUE);
296} 296}
297 297
298EAPI void 298EAPI void
299ecore_exe_continue(Ecore_Exe *obj) 299ecore_exe_continue(Ecore_Exe *obj)
300{ 300{
301 eo_do(obj, efl_control_suspend_set(EINA_FALSE)); 301 efl_control_suspend_set(obj, EINA_FALSE);
302} 302}
303 303
304EOLIAN static void 304EOLIAN static void
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index e416e23..7c503a6 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -1171,7 +1171,7 @@ _ecore_exe_data_generic_handler(void *data,
1171 ecore_event_add(event_type, e, 1171 ecore_event_add(event_type, e,
1172 _ecore_exe_event_exe_data_free, 1172 _ecore_exe_event_exe_data_free,
1173 NULL); 1173 NULL);
1174 eo_do(obj, eo_event_callback_call(eo_event, e)); 1174 eo_event_callback_call(obj, eo_event, e);
1175 } 1175 }
1176 } 1176 }
1177 } 1177 }
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 42cc5ce..bc40414 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data, 158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
159 _ecore_exe_event_exe_data_free, 159 _ecore_exe_event_exe_data_free,
160 NULL); 160 NULL);
161 eo_do(obj, eo_event_callback_call(ECORE_EXE_EVENT_DATA_GET, event_data)); 161 eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
162 } 162 }
163 163
164 current_buf = NULL; 164 current_buf = NULL;
@@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data, 228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
229 _ecore_exe_event_exe_data_free, 229 _ecore_exe_event_exe_data_free,
230 NULL); 230 NULL);
231 eo_do(obj, eo_event_callback_call(ECORE_EXE_EVENT_DATA_ERROR, event_data)); 231 eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
232 } 232 }
233 233
234 current_buf = NULL; 234 current_buf = NULL;
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 6c40158..a7cbfa5 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -61,7 +61,7 @@ ecore_idle_enterer_add(Ecore_Task_Cb func,
61 const void *data) 61 const void *data)
62{ 62{
63 Ecore_Idle_Enterer *ie = NULL; 63 Ecore_Idle_Enterer *ie = NULL;
64 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data)); 64 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(eoid, func, data));
65 return ie; 65 return ie;
66} 66}
67 67
@@ -78,7 +78,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
78 const void *data) 78 const void *data)
79{ 79{
80 Ecore_Idle_Enterer *ie = NULL; 80 Ecore_Idle_Enterer *ie = NULL;
81 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data)); 81 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(eoid, func, data));
82 return ie; 82 return ie;
83} 83}
84 84
@@ -117,7 +117,7 @@ _ecore_idle_enterer_eo_base_destructor(Eo *obj, Ecore_Idle_Enterer_Data *idle_en
117 idle_enterer->delete_me = 1; 117 idle_enterer->delete_me = 1;
118 idle_enterers_delete_me = 1; 118 idle_enterers_delete_me = 1;
119 119
120 eo_do_super(obj, MY_CLASS, eo_destructor()); 120 eo_destructor(eo_super(obj, MY_CLASS));
121} 121}
122 122
123EOLIAN static Eo * 123EOLIAN static Eo *
@@ -128,7 +128,7 @@ _ecore_idle_enterer_eo_base_finalize(Eo *obj, Ecore_Idle_Enterer_Data *idle_ente
128 return NULL; 128 return NULL;
129 } 129 }
130 130
131 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 131 return eo_finalize(eo_super(obj, MY_CLASS));
132} 132}
133 133
134void 134void
@@ -139,7 +139,7 @@ _ecore_idle_enterer_shutdown(void)
139 { 139 {
140 idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers)); 140 idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers));
141 141
142 eo_do(ie->obj, eo_parent_set(NULL)); 142 eo_parent_set(ie->obj, NULL);
143 if (eo_destructed_is(ie->obj)) 143 if (eo_destructed_is(ie->obj))
144 eo_manual_free(ie->obj); 144 eo_manual_free(ie->obj);
145 else 145 else
@@ -201,7 +201,7 @@ _ecore_idle_enterer_call(void)
201 201
202 idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie)); 202 idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
203 203
204 eo_do(ie->obj, eo_parent_set(NULL)); 204 eo_parent_set(ie->obj, NULL);
205 if (eo_destructed_is(ie->obj)) 205 if (eo_destructed_is(ie->obj))
206 eo_manual_free(ie->obj); 206 eo_manual_free(ie->obj);
207 else 207 else
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index d4e6962..5074b13 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -37,7 +37,7 @@ ecore_idle_exiter_add(Ecore_Task_Cb func,
37 const void *data) 37 const void *data)
38{ 38{
39 Ecore_Idle_Exiter *ie = NULL; 39 Ecore_Idle_Exiter *ie = NULL;
40 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data)); 40 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(eoid, func, data));
41 return ie; 41 return ie;
42} 42}
43 43
@@ -88,7 +88,7 @@ _ecore_idle_exiter_eo_base_finalize(Eo *obj, Ecore_Idle_Exiter_Data *idle_exiter
88 return NULL; 88 return NULL;
89 } 89 }
90 90
91 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 91 return eo_finalize(eo_super(obj, MY_CLASS));
92} 92}
93 93
94EOLIAN static void 94EOLIAN static void
@@ -98,7 +98,7 @@ _ecore_idle_exiter_eo_base_destructor(Eo *obj, Ecore_Idle_Exiter_Data *idle_exit
98 idle_exiter->delete_me = 1; 98 idle_exiter->delete_me = 1;
99 idle_exiters_delete_me = 1; 99 idle_exiters_delete_me = 1;
100 100
101 eo_do_super(obj, MY_CLASS, eo_destructor()); 101 eo_destructor(eo_super(obj, MY_CLASS));
102} 102}
103 103
104void 104void
@@ -109,7 +109,7 @@ _ecore_idle_exiter_shutdown(void)
109 { 109 {
110 idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters)); 110 idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters));
111 111
112 eo_do(ie->obj, eo_parent_set(NULL)); 112 eo_parent_set(ie->obj, NULL);
113 if (eo_destructed_is(ie->obj)) 113 if (eo_destructed_is(ie->obj))
114 eo_manual_free(ie->obj); 114 eo_manual_free(ie->obj);
115 else 115 else
@@ -172,7 +172,7 @@ _ecore_idle_exiter_call(void)
172 172
173 idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie)); 173 idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
174 174
175 eo_do(ie->obj, eo_parent_set(NULL)); 175 eo_parent_set(ie->obj, NULL);
176 if (eo_destructed_is(ie->obj)) 176 if (eo_destructed_is(ie->obj))
177 eo_manual_free(ie->obj); 177 eo_manual_free(ie->obj);
178 else 178 else
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 6cd3ba1..f68d424 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -35,7 +35,7 @@ EAPI Ecore_Idler *
35ecore_idler_add(Ecore_Task_Cb func, 35ecore_idler_add(Ecore_Task_Cb func,
36 const void *data) 36 const void *data)
37{ 37{
38 return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data)); 38 return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(eoid, func, data));
39} 39}
40 40
41EOLIAN static void 41EOLIAN static void
@@ -86,7 +86,7 @@ _ecore_idler_eo_base_destructor(Eo *obj, Ecore_Idler_Data *idler)
86 idler->delete_me = 1; 86 idler->delete_me = 1;
87 idlers_delete_me = 1; 87 idlers_delete_me = 1;
88 88
89 eo_do_super(obj, MY_CLASS, eo_destructor()); 89 eo_destructor(eo_super(obj, MY_CLASS));
90} 90}
91 91
92EOLIAN static Eo * 92EOLIAN static Eo *
@@ -97,7 +97,7 @@ _ecore_idler_eo_base_finalize(Eo *obj, Ecore_Idler_Data *idler)
97 return NULL; 97 return NULL;
98 } 98 }
99 99
100 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 100 return eo_finalize(eo_super(obj, MY_CLASS));
101} 101}
102 102
103void 103void
@@ -108,7 +108,7 @@ _ecore_idler_shutdown(void)
108 { 108 {
109 idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers)); 109 idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
110 110
111 eo_do(ie->obj, eo_parent_set(NULL)); 111 eo_parent_set(ie->obj, NULL);
112 if (eo_destructed_is(ie->obj)) 112 if (eo_destructed_is(ie->obj))
113 eo_manual_free(ie->obj); 113 eo_manual_free(ie->obj);
114 else 114 else
@@ -167,7 +167,7 @@ _ecore_idler_all_call(void)
167 167
168 idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie)); 168 idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
169 169
170 eo_do(ie->obj, eo_parent_set(NULL)); 170 eo_parent_set(ie->obj, NULL);
171 if (eo_destructed_is(ie->obj)) 171 if (eo_destructed_is(ie->obj))
172 eo_manual_free(ie->obj); 172 eo_manual_free(ie->obj);
173 else 173 else
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index ed988ab..1f459c7 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -49,7 +49,7 @@ EAPI Ecore_Job *
49ecore_job_add(Ecore_Cb func, 49ecore_job_add(Ecore_Cb func,
50 const void *data) 50 const void *data)
51{ 51{
52 Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data)); 52 Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(eoid, func, data));
53 return job; 53 return job;
54} 54}
55 55
@@ -88,7 +88,7 @@ ecore_job_del(Ecore_Job *obj)
88 Ecore_Job_Data *job = eo_data_scope_get(obj, MY_CLASS); 88 Ecore_Job_Data *job = eo_data_scope_get(obj, MY_CLASS);
89 data = job->data; 89 data = job->data;
90 ecore_event_del(job->event); 90 ecore_event_del(job->event);
91 eo_do(obj, eo_parent_set(NULL)); 91 eo_parent_set(obj, NULL);
92 return data; 92 return data;
93} 93}
94 94
@@ -96,7 +96,7 @@ EOLIAN static void
96_ecore_job_eo_base_destructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED) 96_ecore_job_eo_base_destructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED)
97{ 97{
98 /*FIXME: check if ecore_event_del should be called from here*/ 98 /*FIXME: check if ecore_event_del should be called from here*/
99 eo_do_super(obj, MY_CLASS, eo_destructor()); 99 eo_destructor(eo_super(obj, MY_CLASS));
100} 100}
101 101
102EOLIAN static Eo * 102EOLIAN static Eo *
@@ -107,7 +107,7 @@ _ecore_job_eo_base_finalize(Eo *obj, Ecore_Job_Data *pd)
107 return NULL; 107 return NULL;
108 } 108 }
109 109
110 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 110 return eo_finalize(eo_super(obj, MY_CLASS));
111} 111}
112 112
113static Eina_Bool 113static Eina_Bool
@@ -126,7 +126,7 @@ static void
126_ecore_job_event_free(void *data, 126_ecore_job_event_free(void *data,
127 void *job EINA_UNUSED) 127 void *job EINA_UNUSED)
128{ 128{
129 eo_do(data, eo_parent_set(NULL)); 129 eo_parent_set(data, NULL);
130 130
131 Ecore_Job *obj = data; 131 Ecore_Job *obj = data;
132 132
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 348a734..79f2a78 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
173 { 173 {
174 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); 174 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
175 175
176 eo_do(poller->obj, eo_parent_set(NULL)); 176 eo_parent_set(poller->obj, NULL);
177 if (eo_destructed_is(poller->obj)) 177 if (eo_destructed_is(poller->obj))
178 eo_manual_free(poller->obj); 178 eo_manual_free(poller->obj);
179 else 179 else
@@ -237,8 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
237 const void *data) 237 const void *data)
238{ 238{
239 Ecore_Poller *poller; 239 Ecore_Poller *poller;
240 poller = eo_add(MY_CLASS, _ecore_parent, 240 poller = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eoid, type, interval, func, data));
241 ecore_poller_constructor(type, interval, func, data));
242 return poller; 241 return poller;
243} 242}
244 243
@@ -352,7 +351,7 @@ ecore_poller_del(Ecore_Poller *obj)
352 data = poller->data; 351 data = poller->data;
353 pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); 352 pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
354 353
355 eo_do(poller->obj, eo_parent_set(NULL)); 354 eo_parent_set(poller->obj, NULL);
356 if (eo_destructed_is(poller->obj)) 355 if (eo_destructed_is(poller->obj))
357 eo_manual_free(obj); 356 eo_manual_free(obj);
358 else 357 else
@@ -371,7 +370,7 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
371 poller_delete_count++; 370 poller_delete_count++;
372 } 371 }
373 372
374 eo_do_super(obj, MY_CLASS, eo_destructor()); 373 eo_destructor(eo_super(obj, MY_CLASS));
375} 374}
376 375
377EOLIAN static Eo * 376EOLIAN static Eo *
@@ -382,7 +381,7 @@ _ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd)
382 return NULL; 381 return NULL;
383 } 382 }
384 383
385 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 384 return eo_finalize(eo_super(obj, MY_CLASS));
386} 385}
387 386
388void 387void
@@ -396,7 +395,7 @@ _ecore_poller_shutdown(void)
396 while ((poller = pollers[i])) 395 while ((poller = pollers[i]))
397 { 396 {
398 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); 397 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
399 eo_do(poller->obj, eo_parent_set(NULL)); 398 eo_parent_set(poller->obj, NULL);
400 if (eo_destructed_is(poller->obj)) 399 if (eo_destructed_is(poller->obj))
401 eo_manual_free(poller->obj); 400 eo_manual_free(poller->obj);
402 else 401 else
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 11a6ad1..7343a7f 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -93,7 +93,7 @@ ecore_timer_add(double in,
93 Ecore_Timer *timer = NULL; 93 Ecore_Timer *timer = NULL;
94 94
95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data)); 96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(eoid, in, func, data));
97 return timer; 97 return timer;
98} 98}
99 99
@@ -232,7 +232,7 @@ EAPI void
232ecore_timer_freeze(Ecore_Timer *timer) 232ecore_timer_freeze(Ecore_Timer *timer)
233{ 233{
234 ECORE_TIMER_CHECK(timer); 234 ECORE_TIMER_CHECK(timer);
235 eo_do(timer, eo_event_freeze()); 235 eo_event_freeze(timer);
236} 236}
237 237
238EOLIAN static void 238EOLIAN static void
@@ -261,7 +261,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
261{ 261{
262 int r = 0; 262 int r = 0;
263 263
264 eo_do(timer, r = eo_event_freeze_count_get()); 264 r = eo_event_freeze_count_get(timer);
265 return !!r; 265 return !!r;
266} 266}
267 267
@@ -277,7 +277,7 @@ EAPI void
277ecore_timer_thaw(Ecore_Timer *timer) 277ecore_timer_thaw(Ecore_Timer *timer)
278{ 278{
279 ECORE_TIMER_CHECK(timer); 279 ECORE_TIMER_CHECK(timer);
280 eo_do(timer, eo_event_thaw()); 280 eo_event_thaw(timer);
281} 281}
282 282
283EOLIAN static void 283EOLIAN static void
@@ -357,7 +357,7 @@ _ecore_timer_loop_add(double in,
357 const void *data) 357 const void *data)
358{ 358{
359 Ecore_Timer *timer = NULL; 359 Ecore_Timer *timer = NULL;
360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data)); 360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(eoid, in, func, data));
361 361
362 return timer; 362 return timer;
363} 363}
@@ -397,7 +397,7 @@ _ecore_timer_del(Ecore_Timer *obj)
397 if (timer->delete_me) 397 if (timer->delete_me)
398 timers_delete_me--; 398 timers_delete_me--;
399 399
400 eo_do(obj, eo_parent_set(NULL)); 400 eo_parent_set(obj, NULL);
401 401
402 if (eo_destructed_is(obj)) 402 if (eo_destructed_is(obj))
403 eo_manual_free(obj); 403 eo_manual_free(obj);
@@ -421,7 +421,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd)
421 timers_delete_me++; 421 timers_delete_me++;
422 } 422 }
423 423
424 eo_do_super(obj, MY_CLASS, eo_destructor()); 424 eo_destructor(eo_super(obj, MY_CLASS));
425} 425}
426 426
427EOLIAN static Eo * 427EOLIAN static Eo *
@@ -432,7 +432,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd)
432 return NULL; 432 return NULL;
433 } 433 }
434 434
435 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 435 return eo_finalize(eo_super(obj, MY_CLASS));
436} 436}
437 437
438void 438void
@@ -445,7 +445,7 @@ _ecore_timer_shutdown(void)
445 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); 445 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
446 446
447 eo_data_unref(timer->obj, timer); 447 eo_data_unref(timer->obj, timer);
448 eo_do(timer->obj, eo_parent_set(NULL)); 448 eo_parent_set(timer->obj, NULL);
449 if (eo_destructed_is(timer->obj)) 449 if (eo_destructed_is(timer->obj))
450 eo_manual_free(timer->obj); 450 eo_manual_free(timer->obj);
451 else 451 else
@@ -457,7 +457,7 @@ _ecore_timer_shutdown(void)
457 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); 457 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
458 458
459 eo_data_unref(timer->obj, timer); 459 eo_data_unref(timer->obj, timer);
460 eo_do(timer->obj, eo_parent_set(NULL)); 460 eo_parent_set(timer->obj, NULL);
461 if (eo_destructed_is(timer->obj)) 461 if (eo_destructed_is(timer->obj))
462 eo_manual_free(timer->obj); 462 eo_manual_free(timer->obj);
463 else 463 else
@@ -489,7 +489,7 @@ _ecore_timer_cleanup(void)
489 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); 489 timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
490 490
491 eo_data_unref(timer->obj, timer); 491 eo_data_unref(timer->obj, timer);
492 eo_do(timer->obj, eo_parent_set(NULL)); 492 eo_parent_set(timer->obj, NULL);
493 if (eo_destructed_is(timer->obj)) 493 if (eo_destructed_is(timer->obj))
494 eo_manual_free(timer->obj); 494 eo_manual_free(timer->obj);
495 else 495 else
@@ -514,7 +514,7 @@ _ecore_timer_cleanup(void)
514 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); 514 suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
515 515
516 eo_data_unref(timer->obj, timer); 516 eo_data_unref(timer->obj, timer);
517 eo_do(timer->obj, eo_parent_set(NULL)); 517 eo_parent_set(timer->obj, NULL);
518 if (eo_destructed_is(timer->obj)) 518 if (eo_destructed_is(timer->obj))
519 eo_manual_free(timer->obj); 519 eo_manual_free(timer->obj);
520 else 520 else