aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore.c2
-rw-r--r--src/lib/ecore/ecore_anim.c20
-rw-r--r--src/lib/ecore/ecore_exe.c13
-rw-r--r--src/lib/ecore/ecore_exe_posix.c2
-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.c11
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_poller.c14
-rw-r--r--src/lib/ecore/ecore_timer.c24
11 files changed, 61 insertions, 59 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index f1212581a3..2d2309ec7b 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -262,7 +262,7 @@ ecore_init(void)
#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
- _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
+ eo_add(_ecore_parent, ECORE_PARENT_CLASS, NULL);
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
if (getenv("ECORE_MEM_STAT"))
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 23300906e0..2120a554ac 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -319,7 +319,7 @@ _do_tick(void)
eina_inlist_remove(EINA_INLIST_GET(animators),
EINA_INLIST_GET(animator));
- eo_do(animator->obj, eo_parent_set(NULL));
+ eo_do(animator->obj, eo_parent_set(animator->obj, NULL));
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
@@ -372,8 +372,8 @@ ecore_animator_add(Ecore_Task_Cb func,
{
Ecore_Animator *animator = NULL;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_animator_constructor(func, data));
+ eo_add(animator, MY_CLASS, _ecore_parent,
+ ecore_animator_constructor(NULL, func, data));
return animator;
}
@@ -391,8 +391,8 @@ ecore_animator_timeline_add(double runtime,
const void *data)
{
Ecore_Animator *animator;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_animator_timeline_constructor(runtime, func, data));
+ eo_add(animator, MY_CLASS, _ecore_parent,
+ ecore_animator_timeline_constructor(NULL, runtime, func, data));
return animator;
}
@@ -690,7 +690,7 @@ _ecore_animator_eo_base_destructor(Eo *obj, Ecore_Animator_Data *pd)
pd->delete_me = EINA_TRUE;
animators_delete_me++;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -701,7 +701,7 @@ _ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
EAPI void
@@ -729,7 +729,7 @@ EAPI void
ecore_animator_freeze(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
- eo_do(animator, eo_event_freeze());
+ eo_do(animator, eo_event_freeze(animator));
}
EOLIAN static void
@@ -752,7 +752,7 @@ EAPI void
ecore_animator_thaw(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
- eo_do(animator, eo_event_thaw());
+ eo_do(animator, eo_event_thaw(animator));
}
EOLIAN static void
@@ -838,7 +838,7 @@ _ecore_animator_shutdown(void)
if (animator->suspended) animators_suspended--;
animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
- eo_do(animator->obj, eo_parent_set(NULL));
+ eo_do(animator->obj, eo_parent_set(animator->obj, NULL));
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index e31f96e4bc..c6398f5d4c 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -67,7 +67,8 @@ ecore_exe_pipe_run(const char *exe_cmd,
Ecore_Exe_Flags flags,
const void *data)
{
- Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(exe_cmd, flags));
+ Ecore_Exe *ret;
+ eo_add(ret, MY_CLASS, NULL, ecore_obj_exe_command_set(NULL, exe_cmd, flags));
if (ret)
{
Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS);
@@ -95,7 +96,7 @@ EOLIAN static Eo *
_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
{
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- eo_do_super(obj, MY_CLASS, obj = eo_finalize());
+ obj = eo_super_eo_finalize(MY_CLASS, obj);
if (!obj)
return obj;
@@ -216,7 +217,7 @@ ecore_exe_free(Ecore_Exe *obj)
EOLIAN static void
_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
{
- eo_do_super(obj, ECORE_EXE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_EXE_CLASS, obj);
_impl_ecore_exe_eo_base_destructor(obj, exe);
}
@@ -247,7 +248,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj)
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
const char *ret = NULL;
- eo_do(obj, ecore_obj_exe_command_get(&ret, NULL));
+ eo_do(obj, ecore_obj_exe_command_get(obj, &ret, NULL));
return ret;
}
@@ -292,13 +293,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj)
EAPI void
ecore_exe_pause(Ecore_Exe *obj)
{
- eo_do(obj, efl_control_suspend_set(EINA_TRUE));
+ eo_do(obj, efl_control_suspend_set(obj, EINA_TRUE));
}
EAPI void
ecore_exe_continue(Ecore_Exe *obj)
{
- eo_do(obj, efl_control_suspend_set(EINA_FALSE));
+ eo_do(obj, efl_control_suspend_set(obj, EINA_FALSE));
}
EOLIAN static void
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index e416e23b6d..12b4e2e6ff 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,
ecore_event_add(event_type, e,
_ecore_exe_event_exe_data_free,
NULL);
- eo_do(obj, eo_event_callback_call(eo_event, e));
+ eo_do(obj, eo_event_callback_call(obj, eo_event, e));
}
}
}
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index c4091eeea8..72f3b00178 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,
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(NULL, func, data));
return ie;
}
@@ -82,7 +82,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(NULL, func, data));
return ie;
}
@@ -130,7 +130,7 @@ _ecore_idle_enterer_eo_base_destructor(Eo *obj, Ecore_Idle_Enterer_Data *idle_en
idle_enterer->delete_me = 1;
idle_enterers_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -141,7 +141,7 @@ _ecore_idle_enterer_eo_base_finalize(Eo *obj, Ecore_Idle_Enterer_Data *idle_ente
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -152,7 +152,7 @@ _ecore_idle_enterer_shutdown(void)
{
idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -214,7 +214,7 @@ _ecore_idle_enterer_call(void)
idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index f8aed55f7b..6d1ba9e40c 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,
const void *data)
{
Ecore_Idle_Exiter *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(NULL, func, data));
return ie;
}
@@ -99,7 +99,7 @@ _ecore_idle_exiter_eo_base_finalize(Eo *obj, Ecore_Idle_Exiter_Data *idle_exiter
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
EOLIAN static void
@@ -109,7 +109,7 @@ _ecore_idle_exiter_eo_base_destructor(Eo *obj, Ecore_Idle_Exiter_Data *idle_exit
idle_exiter->delete_me = 1;
idle_exiters_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
void
@@ -120,7 +120,7 @@ _ecore_idle_exiter_shutdown(void)
{
idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -183,7 +183,7 @@ _ecore_idle_exiter_call(void)
idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 7c4a73cfbe..eae71773c4 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -39,7 +39,7 @@ ecore_idler_add(Ecore_Task_Cb func,
_ecore_lock();
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idler_constructor(NULL, func, data));
_ecore_unlock();
return ie;
@@ -98,7 +98,7 @@ _ecore_idler_eo_base_destructor(Eo *obj, Ecore_Idler_Data *idler)
idler->delete_me = 1;
idlers_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -109,7 +109,7 @@ _ecore_idler_eo_base_finalize(Eo *obj, Ecore_Idler_Data *idler)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -120,7 +120,7 @@ _ecore_idler_shutdown(void)
{
idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -179,7 +179,7 @@ _ecore_idler_all_call(void)
idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index ed988ab66c..e6afce4653 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -49,7 +49,8 @@ EAPI Ecore_Job *
ecore_job_add(Ecore_Cb func,
const void *data)
{
- Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data));
+ Ecore_Job *job;
+ eo_add(job, MY_CLASS, _ecore_parent, ecore_job_constructor(NULL, func, data));
return job;
}
@@ -88,7 +89,7 @@ ecore_job_del(Ecore_Job *obj)
Ecore_Job_Data *job = eo_data_scope_get(obj, MY_CLASS);
data = job->data;
ecore_event_del(job->event);
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
return data;
}
@@ -96,7 +97,7 @@ EOLIAN static void
_ecore_job_eo_base_destructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED)
{
/*FIXME: check if ecore_event_del should be called from here*/
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -107,7 +108,7 @@ _ecore_job_eo_base_finalize(Eo *obj, Ecore_Job_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
static Eina_Bool
@@ -126,7 +127,7 @@ static void
_ecore_job_event_free(void *data,
void *job EINA_UNUSED)
{
- eo_do(data, eo_parent_set(NULL));
+ eo_do(data, eo_parent_set(data, NULL));
Ecore_Job *obj = data;
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 97ddf5a895..d1f4e787f7 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2323,7 +2323,7 @@ EAPI Eo *ecore_main_loop_get(void)
{
if (!_mainloop_singleton)
{
- _mainloop_singleton = eo_add(ECORE_MAINLOOP_CLASS, NULL);
+ eo_add(_mainloop_singleton, ECORE_MAINLOOP_CLASS, NULL);
}
return _mainloop_singleton;
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 348a734dd7..1a605a38d0 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)
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
@@ -237,8 +237,8 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
const void *data)
{
Ecore_Poller *poller;
- poller = eo_add(MY_CLASS, _ecore_parent,
- ecore_poller_constructor(type, interval, func, data));
+ eo_add(poller, MY_CLASS, _ecore_parent,
+ ecore_poller_constructor(NULL, type, interval, func, data));
return poller;
}
@@ -352,7 +352,7 @@ ecore_poller_del(Ecore_Poller *obj)
data = poller->data;
pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(obj);
else
@@ -371,7 +371,7 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
poller_delete_count++;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -382,7 +382,7 @@ _ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -396,7 +396,7 @@ _ecore_poller_shutdown(void)
while ((poller = pollers[i]))
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 9b828564ee..23c314ac76 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -97,7 +97,7 @@ ecore_timer_add(double in,
Ecore_Timer *timer = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(NULL, in, func, data));
return timer;
}
@@ -261,7 +261,7 @@ EAPI void
ecore_timer_freeze(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_freeze());
+ eo_do(timer, eo_event_freeze(timer));
}
EOLIAN static void
@@ -294,7 +294,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
{
int r = 0;
- eo_do(timer, r = eo_event_freeze_count_get());
+ eo_do(timer, r = eo_event_freeze_count_get(timer));
return !!r;
}
@@ -310,7 +310,7 @@ EAPI void
ecore_timer_thaw(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_thaw());
+ eo_do(timer, eo_event_thaw(timer));
}
EOLIAN static void
@@ -396,7 +396,7 @@ _ecore_timer_loop_add(double in,
const void *data)
{
Ecore_Timer *timer = NULL;
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(NULL, in, func, data));
return timer;
}
@@ -436,7 +436,7 @@ _ecore_timer_del(Ecore_Timer *obj)
if (timer->delete_me)
timers_delete_me--;
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
if (eo_destructed_is(obj))
eo_manual_free(obj);
@@ -460,7 +460,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd)
timers_delete_me++;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -471,7 +471,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -484,7 +484,7 @@ _ecore_timer_shutdown(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -496,7 +496,7 @@ _ecore_timer_shutdown(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -528,7 +528,7 @@ _ecore_timer_cleanup(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -553,7 +553,7 @@ _ecore_timer_cleanup(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else