summaryrefslogtreecommitdiff
path: root/src/lib/ecore/ecore_poller.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore/ecore_poller.c')
-rw-r--r--src/lib/ecore/ecore_poller.c13
1 files changed, 6 insertions, 7 deletions
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