Replace all timer_add with timer_loop_add

So yeah, I've literally used sed to replace every occurrence of
ecore_time_add() with ecore_timer_loop_add() because I'm reasonably
confident that no part of E has a legitimate need for timer based on the
exact current time.

It would be really nice if I'm not wrong. :)

The reason for this is the incredible spew of clock_gettime() calls I'm
seeing on an ARM system (that should have a vdso for gettime, but...)
This can amount to thousands of system calls per second.

 #YOLO
devs/bu5hm4n/luncher_verbose
Derek Foreman 6 years ago
parent 4e9335547f
commit 73aecd73ab
  1. 2
      src/bin/e_actions.c
  2. 2
      src/bin/e_backlight.c
  3. 2
      src/bin/e_bindings.c
  4. 4
      src/bin/e_bryce.c
  5. 8
      src/bin/e_client.c
  6. 6
      src/bin/e_comp.c
  7. 4
      src/bin/e_comp_canvas.c
  8. 2
      src/bin/e_comp_wl.c
  9. 10
      src/bin/e_comp_x.c
  10. 6
      src/bin/e_config.c
  11. 2
      src/bin/e_config_dialog.c
  12. 2
      src/bin/e_configure.c
  13. 6
      src/bin/e_dpms.c
  14. 4
      src/bin/e_exec.c
  15. 20
      src/bin/e_fm.c
  16. 4
      src/bin/e_fm/e_fm_ipc.c
  17. 6
      src/bin/e_fm/e_fm_main_eeze.c
  18. 12
      src/bin/e_fm/e_fm_main_udisks.c
  19. 8
      src/bin/e_fm/e_fm_main_udisks2.c
  20. 2
      src/bin/e_focus.c
  21. 4
      src/bin/e_gadcon.c
  22. 8
      src/bin/e_icon.c
  23. 2
      src/bin/e_ilist.c
  24. 2
      src/bin/e_init.c
  25. 4
      src/bin/e_int_gadcon_config.c
  26. 2
      src/bin/e_int_menus.c
  27. 2
      src/bin/e_main.c
  28. 4
      src/bin/e_module.c
  29. 2
      src/bin/e_order.c
  30. 4
      src/bin/e_powersave.c
  31. 4
      src/bin/e_randr2.c
  32. 14
      src/bin/e_screensaver.c
  33. 10
      src/bin/e_shelf.c
  34. 2
      src/bin/e_slider.c
  35. 2
      src/bin/e_spectrum.c
  36. 10
      src/bin/e_sys.c
  37. 18
      src/bin/e_test.c
  38. 2
      src/bin/e_thumb.c
  39. 4
      src/bin/e_thumb_main.c
  40. 2
      src/bin/e_update.c
  41. 6
      src/bin/e_utils.c
  42. 2
      src/bin/e_video.c
  43. 2
      src/bin/e_widget_ilist.c
  44. 4
      src/bin/e_xkb.c
  45. 2
      src/bin/e_xsettings.c
  46. 2
      src/bin/e_zone.c
  47. 2
      src/modules/appmenu/e_mod_appmenu_render.c
  48. 4
      src/modules/backlight/e_mod_main.c
  49. 8
      src/modules/battery/batget.c
  50. 2
      src/modules/battery/e_mod_main.c
  51. 2
      src/modules/clock/e_mod_main.c
  52. 4
      src/modules/conf_applications/e_int_config_apps.c
  53. 2
      src/modules/everything/e_mod_main.c
  54. 10
      src/modules/everything/evry.c
  55. 2
      src/modules/everything/evry_view_tabs.c
  56. 8
      src/modules/fileman/e_fwin.c
  57. 2
      src/modules/fileman_opinfo/e_mod_main.c
  58. 12
      src/modules/ibar/e_mod_main.c
  59. 8
      src/modules/luncher/bar.c
  60. 2
      src/modules/luncher/grid.c
  61. 2
      src/modules/mixer/lib/backends/pulseaudio/pulse.c
  62. 4
      src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c
  63. 2
      src/modules/notification/e_mod_main.c
  64. 2
      src/modules/notification/e_mod_popup.c
  65. 2
      src/modules/packagekit/e_mod_main.c
  66. 6
      src/modules/pager/e_mod_main.c
  67. 6
      src/modules/pager/gadget/pager.c
  68. 6
      src/modules/pager_plain/e_mod_main.c
  69. 8
      src/modules/quickaccess/e_mod_quickaccess.c
  70. 4
      src/modules/shot/e_mod_main.c
  71. 2
      src/modules/syscon/e_syscon.c
  72. 2
      src/modules/sysinfo/batman/batman.c
  73. 8
      src/modules/sysinfo/batman/batman_fallback.c
  74. 2
      src/modules/tasks/e_mod_main.c
  75. 8
      src/modules/teamwork/e_mod_tw.c
  76. 2
      src/modules/tiling/e_mod_tiling.c
  77. 2
      src/modules/time/clock.c
  78. 2
      src/modules/time/time.c
  79. 2
      src/modules/winlist/e_winlist.c
  80. 4
      src/modules/wizard/e_wizard.c
  81. 2
      src/modules/wizard/page_000.c
  82. 2
      src/modules/wizard/page_040.c
  83. 2
      src/modules/wizard/page_110.c
  84. 6
      src/modules/xkbswitch/e_mod_config.c
  85. 2
      src/tests/focusgrab.c
  86. 2
      src/tests/fullscreen.c
  87. 2
      src/tests/override_fullscreen.c
  88. 2
      src/tests/shaped_input.c

@ -2686,7 +2686,7 @@ _delayed_action_list_parse(Delayed_Action *da, const char *params)
eina_strlcpy(a2, a2start, a2stop - a2start + 1);
_delayed_action_list_parse_action(a2, &delay, &da->delayed.action, &da->delayed.params);
}
da->timer = ecore_timer_add(delay, _delayed_action_cb_timer, da);
da->timer = ecore_timer_loop_add(delay, _delayed_action_cb_timer, da);
}
static void

@ -496,7 +496,7 @@ _e_bl_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
bl_sys_set_exe_ready = EINA_FALSE;
bl_sys_set_exe = NULL;
ecore_timer_add(0.05, _e_bl_cb_ext_delay, NULL);
ecore_timer_loop_add(0.05, _e_bl_cb_ext_delay, NULL);
}
return ECORE_CALLBACK_RENEW;
}

@ -904,7 +904,7 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
ed->obj = obj;
ed->act = act;
ed->ev = ev2;
binding->timer = ecore_timer_add(((double)binding->delay), _e_bindings_edge_cb_timer, ed);
binding->timer = ecore_timer_loop_add(((double)binding->delay), _e_bindings_edge_cb_timer, ed);
return act;
}

@ -303,7 +303,7 @@ _bryce_autohide_hide(Bryce *b)
if (b->autohide_timer)
ecore_timer_reset(b->autohide_timer);
else
b->autohide_timer = ecore_timer_add(1.0, (Ecore_Task_Cb)_bryce_autohide_timeout, b);
b->autohide_timer = ecore_timer_loop_add(1.0, (Ecore_Task_Cb)_bryce_autohide_timeout, b);
}
static void
@ -503,7 +503,7 @@ _bryce_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event
if (b->save_timer)
ecore_timer_reset(b->save_timer);
else
b->save_timer = ecore_timer_add(0.5, _bryce_moveresize_save, b);
b->save_timer = ecore_timer_loop_add(0.5, _bryce_moveresize_save, b);
}
if (starting) return;

@ -875,7 +875,7 @@ _e_client_action_move_timeout_add(void)
{
E_FREE_FUNC(action_timer, ecore_timer_del);
if (EINA_DBL_NONZERO(e_config->border_keyboard.timeout))
action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_client_action_move_timeout, NULL);
action_timer = ecore_timer_loop_add(e_config->border_keyboard.timeout, _e_client_action_move_timeout, NULL);
}
static Eina_Bool
@ -1095,7 +1095,7 @@ _e_client_action_resize_timeout_add(void)
{
E_FREE_FUNC(action_timer, ecore_timer_del);
if (EINA_DBL_NONZERO(e_config->border_keyboard.timeout))
action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_client_action_resize_timeout, NULL);
action_timer = ecore_timer_loop_add(e_config->border_keyboard.timeout, _e_client_action_resize_timeout, NULL);
}
static Eina_Bool
@ -4952,7 +4952,7 @@ e_client_act_kill_begin(E_Client *ec)
if ((ec->netwm.pid > 1) && (e_config->kill_process))
{
kill(ec->netwm.pid, SIGINT);
ec->kill_timer = ecore_timer_add(e_config->kill_timer_wait,
ec->kill_timer = ecore_timer_loop_add(e_config->kill_timer_wait,
_e_client_cb_kill_timer, ec);
}
else
@ -5423,7 +5423,7 @@ e_client_pointer_warp_to_center(E_Client *ec)
warp_client = ec;
ecore_evas_pointer_xy_get(e_comp->ee, &warp_x[0], &warp_y[0]);
if (warp_timer) ecore_timer_del(warp_timer);
warp_timer = ecore_timer_add(0.01, _e_client_pointer_warp_to_center_timer, ec);
warp_timer = ecore_timer_loop_add(0.01, _e_client_pointer_warp_to_center_timer, ec);
return 1;
}

@ -526,7 +526,7 @@ nocomp:
else if ((!e_comp->nocomp) && (!e_comp->nocomp_override))
{
if (!e_comp->nocomp_delay_timer)
e_comp->nocomp_delay_timer = ecore_timer_add(1.0, _e_comp_cb_nocomp_begin_timeout, NULL);
e_comp->nocomp_delay_timer = ecore_timer_loop_add(1.0, _e_comp_cb_nocomp_begin_timeout, NULL);
}
}
}
@ -1348,7 +1348,7 @@ e_comp_style_selector_create(Evas *evas, const char **source)
}
evas_object_data_set(orec0, "list", style_list);
evas_object_data_set(oi, "style_shadows", style_shadows);
timer = ecore_timer_add(3.0, _style_demo, oi);
timer = ecore_timer_loop_add(3.0, _style_demo, oi);
evas_object_data_set(oi, "style_timer", timer);
evas_object_data_set(oi, "style_demo_state", (void *)1);
e_widget_size_min_get(oi, &wmw, &wmh);
@ -1607,7 +1607,7 @@ e_comp_override_timed_pop(void)
if (e_comp->nocomp_override_timer)
e_comp->nocomp_override--;
else
e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, NULL);
e_comp->nocomp_override_timer = ecore_timer_loop_add(1.0, _e_comp_override_expire, NULL);
}
E_API unsigned int

@ -258,7 +258,7 @@ _e_comp_canvas_screensaver_active(void *d EINA_UNUSED, Evas_Object *obj EINA_UNU
{
if (timer_post_screensaver_on) return;
/* thawed in _e_comp_screensaver_off() */
timer_post_screensaver_on = ecore_timer_add
timer_post_screensaver_on = ecore_timer_loop_add
(1.0, _e_comp_cb_screensaver_active_delay, NULL);
}
@ -279,7 +279,7 @@ _e_comp_cb_screensaver_on()
if (e_config->desklock_post_screensaver_time <= 1.0)
e_desklock_show_autolocked();
else
timer_post_screensaver_lock = ecore_timer_add
timer_post_screensaver_lock = ecore_timer_loop_add
(e_config->desklock_post_screensaver_time,
_e_comp_cb_timer_post_screensaver_lock, NULL);
}

@ -659,7 +659,7 @@ _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
if (e_comp_util_kbd_grabbed()) return;
e_comp_wl_data_device_keyboard_focus_set();
ec->comp_data->on_focus_timer =
ecore_timer_add(0.8, (Ecore_Task_Cb)_e_comp_wl_evas_cb_focus_in_timer, ec);
ecore_timer_loop_add(0.8, (Ecore_Task_Cb)_e_comp_wl_evas_cb_focus_in_timer, ec);
}
static void

@ -1484,7 +1484,7 @@ _e_comp_x_show(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Windo
if (c->x_comp_data->retry_timer)
ecore_timer_reset(c->x_comp_data->retry_timer);
else
c->x_comp_data->retry_timer = ecore_timer_add(0.02, _e_comp_x_show_retry, c);
c->x_comp_data->retry_timer = ecore_timer_loop_add(0.02, _e_comp_x_show_retry, c);
c->x_comp_data->retry_clients = eina_list_append(c->x_comp_data->retry_clients, (uintptr_t*)(unsigned long)ev->win);
return ECORE_CALLBACK_RENEW;
}
@ -2879,7 +2879,7 @@ _e_comp_x_focus_timer(void)
if (focus_timer)
ecore_timer_reset(focus_timer);
else /* focus has changed twice in .002 seconds; .01 seconds should be more than enough delay */
focus_timer = ecore_timer_add(0.01, _e_comp_x_focus_timer_cb, NULL);
focus_timer = ecore_timer_loop_add(0.01, _e_comp_x_focus_timer_cb, NULL);
}
static Eina_Bool
@ -4571,7 +4571,7 @@ _e_comp_x_hook_client_new(void *d EINA_UNUSED, E_Client *ec)
eina_hash_add(clients_win_hash, &win, ec);
if (!ec->input_only)
ec->comp_data->first_draw_delay = ecore_timer_add(e_comp_config_get()->first_draw_delay, _e_comp_x_first_draw_delay_cb, ec);
ec->comp_data->first_draw_delay = ecore_timer_loop_add(e_comp_config_get()->first_draw_delay, _e_comp_x_first_draw_delay_cb, ec);
}
static void
@ -4895,13 +4895,13 @@ _e_comp_x_screensaver_notify_cb(void *data EINA_UNUSED, int type EINA_UNUSED, Ec
{
saver_on = EINA_TRUE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_add(0.3, _e_comp_x_screensaver_eval_cb, NULL);
screensaver_eval_timer = ecore_timer_loop_add(0.3, _e_comp_x_screensaver_eval_cb, NULL);
}
else if ((!ev->on) && (saver_on))
{
saver_on = EINA_FALSE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_add(0.3, _e_comp_x_screensaver_eval_cb, NULL);
screensaver_eval_timer = ecore_timer_loop_add(0.3, _e_comp_x_screensaver_eval_cb, NULL);
}
return ECORE_CALLBACK_PASS_ON;
}

@ -1020,7 +1020,7 @@ e_config_load(void)
_e_config_free(e_config);
e_config = NULL;
reload = 1;
ecore_timer_add(1.0, _e_config_cb_timer,
ecore_timer_loop_add(1.0, _e_config_cb_timer,
_("Settings data needed upgrading. Your old settings have<br>"
"been wiped and a new set of defaults initialized. This<br>"
"will happen regularly during development, so don't report a<br>"
@ -1037,7 +1037,7 @@ e_config_load(void)
_e_config_free(e_config);
e_config = NULL;
reload = 1;
ecore_timer_add(1.0, _e_config_cb_timer,
ecore_timer_loop_add(1.0, _e_config_cb_timer,
_("Your settings are NEWER than Enlightenment. This is very<br>"
"strange. This should not happen unless you downgraded<br>"
"Enlightenment or copied the settings from a place where<br>"
@ -1153,7 +1153,7 @@ e_config_load(void)
e_bindings = e_config_domain_system_load("e_bindings", _e_config_binding_edd);
e_config_profile_set(prof);
eina_stringshare_del(prof);
ecore_timer_add(1.0, _e_config_cb_timer,
ecore_timer_loop_add(1.0, _e_config_cb_timer,
_("Your bindings settings version does not match the current settings version.<br>"
"As a result, all bindings have been reloaded from defaults.<br>"
"Sorry for the inconvenience.<br>"));

@ -413,7 +413,7 @@ _e_config_dialog_changed(E_Config_Dialog *cfd)
if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer);
cfd->auto_apply_timer = NULL;
cfd->auto_apply_timer =
ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
ecore_timer_loop_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
}
}

@ -43,7 +43,7 @@ e_configure_init(void)
ecore_job_del(update_job);
update_job = NULL;
}
ecore_timer_add(0.0, _configure_init_timer, NULL);
ecore_timer_loop_add(0.0, _configure_init_timer, NULL);
}
E_API void

@ -163,9 +163,9 @@ _e_dpms_off(void *d EINA_UNUSED)
static Eina_Bool
_e_dpms_screensaver_on()
{
standby_timer = ecore_timer_add(STANDBY, _e_dpms_standby, NULL);
suspend_timer = ecore_timer_add(SUSPEND, _e_dpms_suspend, NULL);
off_timer = ecore_timer_add(OFF, _e_dpms_off, NULL);
standby_timer = ecore_timer_loop_add(STANDBY, _e_dpms_standby, NULL);
suspend_timer = ecore_timer_loop_add(SUSPEND, _e_dpms_suspend, NULL);
off_timer = ecore_timer_loop_add(OFF, _e_dpms_off, NULL);
return ECORE_CALLBACK_RENEW;
}

@ -548,7 +548,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
inst->exe = exe;
inst->startup_id = startup_id;
inst->launch_time = ecore_time_get();
inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout,
inst->expire_timer = ecore_timer_loop_add(e_config->exec.expire_timeout,
_e_exec_cb_expire_timer, inst);
l = eina_hash_find(e_exec_instances, inst->key);
lnew = eina_list_append(l, inst);
@ -750,7 +750,7 @@ _e_exec_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
inst->exe = NULL;
if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst);
inst->expire_timer = ecore_timer_loop_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst);
}
else
*/

@ -824,8 +824,8 @@ e_fm2_init(void)
efreet_mime_init();
/* XXX: move this to a central/global place? */
_e_fm2_mime_flush = ecore_timer_add(60.0, _e_fm2_mime_flush_cb, NULL);
_e_fm2_mime_clear = ecore_timer_add(600.0, _e_fm2_mime_clear_cb, NULL);
_e_fm2_mime_flush = ecore_timer_loop_add(60.0, _e_fm2_mime_flush_cb, NULL);
_e_fm2_mime_clear = ecore_timer_loop_add(600.0, _e_fm2_mime_clear_cb, NULL);
_e_fm2_icon_desktop_str = eina_stringshare_add("DESKTOP");
_e_fm2_icon_thumb_str = eina_stringshare_add("THUMB");
@ -2868,7 +2868,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
if (!sd->scan_timer)
{
sd->scan_timer =
ecore_timer_add(0.5,
ecore_timer_loop_add(0.5,
_e_fm2_cb_scan_timer,
sd->obj);
sd->busy_count++;
@ -2940,7 +2940,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
{
ecore_timer_del(sd->scan_timer);
sd->scan_timer =
ecore_timer_add(0.0001,
ecore_timer_loop_add(0.0001,
_e_fm2_cb_scan_timer,
sd->obj);
}
@ -5961,7 +5961,7 @@ _e_fm2_typebuf_match(Evas_Object *obj, int next)
;
if (sd->typebuf.timer) ecore_timer_reset(sd->typebuf.timer);
else sd->typebuf.timer = ecore_timer_add(3.5, _e_fm_typebuf_timer_cb, sd);
else sd->typebuf.timer = ecore_timer_loop_add(3.5, _e_fm_typebuf_timer_cb, sd);
return ic_match;
}
@ -7024,7 +7024,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
NULL, vol);
if (sd->drop_icon->mount_timer) ecore_timer_reset(sd->drop_icon->mount_timer);
else sd->drop_icon->mount_timer = ecore_timer_add(15., (Ecore_Task_Cb)_e_fm2_cb_dnd_selection_notify_post_mount_timer, sd->drop_icon);
else sd->drop_icon->mount_timer = ecore_timer_loop_add(15., (Ecore_Task_Cb)_e_fm2_cb_dnd_selection_notify_post_mount_timer, sd->drop_icon);
#ifndef HAVE_WAYLAND_ONLY
if ((e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_ASK) ||
((sd->config->view.link_drop) || (!sd->drop_icon)))
@ -7482,7 +7482,7 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped EINA_UNUSED)
if (ic->sd->dnd_scroller) ecore_animator_del(ic->sd->dnd_scroller);
ic->sd->dnd_scroller = NULL;
if (ic->drag.dnd_end_timer) ecore_timer_reset(ic->drag.dnd_end_timer);
else ic->drag.dnd_end_timer = ecore_timer_add(0.2, (Ecore_Task_Cb)_e_fm2_cb_drag_finished_show, ic);
else ic->drag.dnd_end_timer = ecore_timer_loop_add(0.2, (Ecore_Task_Cb)_e_fm2_cb_drag_finished_show, ic);
/* NOTE:
* do not touch ic after this callback; it's possible that it may have been deleted
*/
@ -8439,7 +8439,7 @@ _e_fm2_cb_scan_timer(void *data)
return ECORE_CALLBACK_CANCEL;
}
if (sd->busy_count > 0)
sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, sd->obj);
sd->scan_timer = ecore_timer_loop_add(0.2, _e_fm2_cb_scan_timer, sd->obj);
else
{
if (!sd->sort_idler)
@ -11238,7 +11238,7 @@ _e_fm2_live_process_begin(Evas_Object *obj)
if ((sd->live.idler) || (sd->live.timer) ||
(sd->listing) || (sd->scan_timer)) return;
sd->live.idler = ecore_idler_add(_e_fm2_cb_live_idler, obj);
sd->live.timer = ecore_timer_add(0.2, _e_fm2_cb_live_timer, obj);
sd->live.timer = ecore_timer_loop_add(0.2, _e_fm2_cb_live_timer, obj);
sd->tmp.last_insert = NULL;
}
@ -11414,7 +11414,7 @@ _e_fm2_cb_live_timer(void *data)
sd->live.deletions = EINA_FALSE;
sd->live.timer = NULL;
if ((!sd->queue) && (!sd->live.idler)) return ECORE_CALLBACK_CANCEL;
sd->live.timer = ecore_timer_add(0.2, _e_fm2_cb_live_timer, data);
sd->live.timer = ecore_timer_loop_add(0.2, _e_fm2_cb_live_timer, data);
return ECORE_CALLBACK_CANCEL;
}

@ -1051,7 +1051,7 @@ _e_fm_ipc_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing
ed->recent_mods = eina_list_append(ed->recent_mods, m);
}
if ((!ed->recent_clean) && (ed->recent_mods))
ed->recent_clean = ecore_timer_add(DEF_MOD_BACKOFF, _e_fm_ipc_cb_recent_clean, ed);
ed->recent_clean = ecore_timer_loop_add(DEF_MOD_BACKOFF, _e_fm_ipc_cb_recent_clean, ed);
if (skip)
{
// printf("SKIP MOD %s %3.3f\n", path, t_now);
@ -1372,7 +1372,7 @@ e_fm_ipc_volume_add(E_Volume *v)
if (_init_timer && (!_init_timer_run))
ecore_timer_reset(_init_timer);
else if ((!_init_timer) && (!_init_timer_run))
_init_timer = ecore_timer_add(2.0, _e_fm_ipc_timer_cb, NULL);
_init_timer = ecore_timer_loop_add(2.0, _e_fm_ipc_timer_cb, NULL);
msg_data = _e_fm_shared_codec_volume_encode(v, &msg_size);
if (!msg_data) return;

@ -312,7 +312,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v)
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
eeze_disk_mount_wrapper_set(v->disk, buf);
}
v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);
eeze_disk_eject(v->disk);
}
@ -505,7 +505,7 @@ _e_fm_main_eeze_volume_unmount(E_Volume *v)
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
eeze_disk_mount_wrapper_set(v->disk, buf);
}
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);
eeze_disk_unmount(v->disk);
}
@ -541,7 +541,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)
snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
eeze_disk_mount_wrapper_set(v->disk, buf2);
}
v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);
INF("MOUNT: %s", v->udi);
if (!eeze_disk_mount(v->disk)) goto error;
return;

@ -835,7 +835,7 @@ _volume_mount(Eldbus_Proxy *proxy, const char *fstype, Eina_List *opt)
static Eina_Bool
_e_fm_main_udisks_cb_vol_ejecting_after_unmount(E_Volume *v)
{
v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_eject_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_eject_timeout, v);
v->op = _volume_eject(v->storage->proxy);
return ECORE_CALLBACK_CANCEL;
@ -847,7 +847,7 @@ _e_fm_main_udisks_cb_vol_unmounted_before_eject(E_Volume *v)
_e_fm_main_udisks_cb_vol_unmounted(v);
// delay is required for all message handlers were executed after unmount
ecore_timer_add(1.0, (Ecore_Task_Cb)_e_fm_main_udisks_cb_vol_ejecting_after_unmount, v);
ecore_timer_loop_add(1.0, (Ecore_Task_Cb)_e_fm_main_udisks_cb_vol_ejecting_after_unmount, v);
}
static void
@ -974,12 +974,12 @@ _e_fm_main_udisks_volume_eject(E_Volume *v)
if (!v || v->guard) return;
if (v->mounted)
{
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_unmount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_unmount_timeout, v);
v->op = _volume_umount(v->proxy);
}
else
{
v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_eject_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_eject_timeout, v);
v->op = _volume_eject(v->storage->proxy);
}
v->optype = E_VOLUME_OP_TYPE_EJECT;
@ -991,7 +991,7 @@ _e_fm_main_udisks_volume_unmount(E_Volume *v)
if (!v || v->guard) return;
INF("unmount %s %s", v->udi, v->mount_point);
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_unmount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_unmount_timeout, v);
v->op = _volume_umount(v->proxy);
v->optype = E_VOLUME_OP_TYPE_UNMOUNT;
}
@ -1040,7 +1040,7 @@ _e_fm_main_udisks_volume_mount(E_Volume *v)
opt = eina_list_append(opt, buf2);
}
v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_mount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_mount_timeout, v);
// It was previously noted here that ubuntu 10.04 failed to mount if opt was passed to
// e_udisks_volume_mount. The reason at the time was unknown and apparently never found.

@ -1129,13 +1129,13 @@ _e_fm_main_udisks2_volume_eject(E_Volume *v)
}
if (v->mounted)
{
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_unmount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_unmount_timeout, v);
v->op = _volume_umount(v);
vols_ejecting = eina_list_append(vols_ejecting, v);
}
else
{
v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_eject_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_eject_timeout, v);
v->op = _volume_eject(v->storage->proxy);
}
v->optype = E_VOLUME_OP_TYPE_EJECT;
@ -1147,7 +1147,7 @@ _e_fm_main_udisks2_volume_unmount(E_Volume *v)
if (!v || v->guard) return;
INF("unmount %s %s", v->udi, v->mount_point);
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_unmount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_unmount_timeout, v);
v->op = _volume_umount(v);
v->optype = E_VOLUME_OP_TYPE_UNMOUNT;
}
@ -1178,7 +1178,7 @@ _e_fm_main_udisks2_volume_mount(E_Volume *v)
else if (!strcmp(v->fstype, "ntfs"))
snprintf(buf, sizeof(buf), "uid=%i", (int)getuid());
v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_mount_timeout, v);
v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks2_vol_mount_timeout, v);
// It was previously noted here that ubuntu 10.04 failed to mount if opt was passed to
// e_udisks2_volume_mount. The reason at the time was unknown and apparently never found.

@ -24,7 +24,7 @@ e_focus_event_mouse_in(E_Client *ec)
evas_object_raise(ec->frame);
}
else
ec->raise_timer = ecore_timer_add(e_config->auto_raise_delay, _e_focus_raise_timer, ec);
ec->raise_timer = ecore_timer_loop_add(e_config->auto_raise_delay, _e_focus_raise_timer, ec);
}
}

@ -1939,7 +1939,7 @@ e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord
d = 1.0;
if (!gcc->scroll_timer)
gcc->scroll_timer =
ecore_timer_add(0.01, _e_gadcon_cb_client_scroll_timer, gcc);
ecore_timer_loop_add(0.01, _e_gadcon_cb_client_scroll_timer, gcc);
if (!gcc->scroll_animator)
gcc->scroll_animator =
ecore_animator_add(_e_gadcon_cb_client_scroll_animator, gcc);
@ -3283,7 +3283,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
if (gcc->instant_edit_timer)
ecore_timer_del(gcc->instant_edit_timer);
gcc->instant_edit_timer =
ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer,
ecore_timer_loop_add(1.0, _e_gadcon_client_cb_instant_edit_timer,
gcc);
}
}

@ -114,7 +114,7 @@ _frame_anim(void *data)
fr = (sd->frame % (sd->frame_count)) + 1;
evas_object_image_animated_frame_set(sd->obj, fr);
t = evas_object_image_animated_frame_duration_get(sd->obj, fr, 0);
sd->timer = ecore_timer_add(t, _frame_anim, sd);
sd->timer = ecore_timer_loop_add(t, _frame_anim, sd);
return EINA_FALSE;
}
@ -132,7 +132,7 @@ _handle_anim(E_Smart_Data *sd)
if (sd->frame_count < 2) return 0;
if (!sd->invalid) evas_object_show(sd->obj);
t = evas_object_image_animated_frame_duration_get(sd->obj, sd->frame, 0);
sd->timer = ecore_timer_add(t, _frame_anim, sd);
sd->timer = ecore_timer_loop_add(t, _frame_anim, sd);
return 1;
}
@ -864,7 +864,7 @@ _e_icon_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
if (sd->fdo)
{
if (sd->fdo_reload_timer) ecore_timer_del(sd->fdo_reload_timer);
sd->fdo_reload_timer = ecore_timer_add(0.1, _e_icon_fdo_reload, sd);
sd->fdo_reload_timer = ecore_timer_loop_add(0.1, _e_icon_fdo_reload, sd);
}
if ((!sd->edje) && ((sd->loading && sd->preload) ||
@ -874,7 +874,7 @@ _e_icon_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
evas_object_image_scale_hint_set(sd->obj,
EVAS_IMAGE_SCALE_HINT_DYNAMIC);
if (!sd->guessing_animation)
sd->guessing_animation = ecore_timer_add(0.3,
sd->guessing_animation = ecore_timer_loop_add(0.3,
_e_icon_guess_anim,
sd);
}

@ -1201,7 +1201,7 @@ _e_typebuf_timer_update(Evas_Object *obj)
if (sd->typebuf.timer)
ecore_timer_del(sd->typebuf.timer);
sd->typebuf.timer = ecore_timer_add(3.0, _e_typebuf_timer_cb, obj);
sd->typebuf.timer = ecore_timer_loop_add(3.0, _e_typebuf_timer_cb, obj);
}
static void

@ -74,7 +74,7 @@ e_init_show(void)
"Disable splash screen");
edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e",
_e_init_cb_signal_done_ok, NULL);
_e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL);
_e_init_timeout_timer = ecore_timer_loop_add(240.0, _e_init_cb_timeout, NULL);
e_init_title_set(_("Enlightenment"));
e_init_version_set(VERSION);
}

@ -722,7 +722,7 @@ _advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
////////////////////////////////////////////////////////////
e_widget_toolbook_page_show(otb, 0);
if (cfdata->load_timer) ecore_timer_del(cfdata->load_timer);
cfdata->load_timer = ecore_timer_add(0.01, _cb_load_timer, cfdata);
cfdata->load_timer = ecore_timer_loop_add(0.01, _cb_load_timer, cfdata);
elm_win_center(cfd->dia->win, 1, 1);
@ -756,7 +756,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_table_object_append(ot, cfdata->o_del, 1, 1, 1, 1, 1, 1, 1, 0);
if (cfdata->load_timer) ecore_timer_del(cfdata->load_timer);
cfdata->load_timer = ecore_timer_add(0.01, _cb_load_timer, cfdata);
cfdata->load_timer = ecore_timer_loop_add(0.01, _cb_load_timer, cfdata);
elm_win_center(cfd->dia->win, 1, 1);

@ -913,7 +913,7 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir)
if (_e_int_menus_app_cleaner)
ecore_timer_reset(_e_int_menus_app_cleaner);
else
_e_int_menus_app_cleaner = ecore_timer_add(300, _e_int_menus_app_cleaner_cb, NULL);
_e_int_menus_app_cleaner = ecore_timer_loop_add(300, _e_int_menus_app_cleaner_cb, NULL);
eina_stringshare_del(dir);
if (m)
{

@ -1046,7 +1046,7 @@ main(int argc, char **argv)
TS("Run Startup Apps Done");
if (e_config->show_splash && (!after_restart))
ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL);
ecore_timer_loop_add(2.0, _e_main_cb_startup_fake_end, NULL);
TS("E_Comp Thaw");
e_comp_all_thaw();

@ -831,7 +831,7 @@ _e_module_dialog_disable_create(const char *title, const char *body, E_Module *m
dd->title = strdup(title);
dd->body = strdup(body);
dd->m = m;
ecore_timer_add(1.5, (Ecore_Task_Cb)_e_module_dialog_disable_timer, dd);
ecore_timer_loop_add(1.5, (Ecore_Task_Cb)_e_module_dialog_disable_timer, dd);
}
static void
@ -1116,7 +1116,7 @@ _e_module_whitelist_check(void)
#endif
if (eina_list_count(badl) != known)
ecore_timer_add(1.5, _e_module_whitelist_dialog_timer, badl);
ecore_timer_loop_add(1.5, _e_module_whitelist_dialog_timer, badl);
else
{
EINA_LIST_FREE(badl, s)

@ -252,7 +252,7 @@ _e_order_cb_monitor(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_E
E_Order *eo = data;
if (eo->delay) ecore_timer_del(eo->delay);
eo->delay = ecore_timer_add(0.2, _e_order_cb_monitor_delay, eo);
eo->delay = ecore_timer_loop_add(0.2, _e_order_cb_monitor_delay, eo);
}
static void

@ -45,7 +45,7 @@ e_powersave_deferred_action_add(void (*func)(void *data), const void *data)
pa = calloc(1, sizeof(E_Powersave_Deferred_Action));
if (!pa) return NULL;
if (deferred_timer) ecore_timer_del(deferred_timer);
deferred_timer = ecore_timer_add(defer_time,
deferred_timer = ecore_timer_loop_add(defer_time,
_e_powersave_cb_deferred_timer,
NULL);
pa->func = func;
@ -165,7 +165,7 @@ _e_powersave_mode_eval(void)
if (!EINA_DBL_EQ(t, defer_time))
{
if (deferred_timer) ecore_timer_del(deferred_timer);
deferred_timer = ecore_timer_add(defer_time,
deferred_timer = ecore_timer_loop_add(defer_time,
_e_powersave_cb_deferred_timer,
NULL);
defer_time = t;

@ -235,7 +235,7 @@ _cb_fade_animator(void *data EINA_UNUSED)
{
if (_target_to == 255)
{
_apply_delay = ecore_timer_add(5.0, _cb_delay_timer, NULL);
_apply_delay = ecore_timer_loop_add(5.0, _cb_delay_timer, NULL);
_do_apply();
_screen_check_unconfigured(e_randr2, e_randr2_cfg);
}
@ -1107,7 +1107,7 @@ e_randr2_screen_refresh_queue(Eina_Bool lid_event)
if (_screen_delay_timer)
ecore_timer_reset(_screen_delay_timer);
else
_screen_delay_timer = ecore_timer_add(1.0, _cb_screen_change_delay, NULL);
_screen_delay_timer = ecore_timer_loop_add(1.0, _cb_screen_change_delay, NULL);
event_screen |= !!lid_event;
}

@ -114,7 +114,7 @@ e_screensaver_update(void)
{
E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del);
if (timeout)
_e_screensaver_timer = ecore_timer_add(timeout, _e_screensaver_idle_timeout_cb, (void*)1);
_e_screensaver_timer = ecore_timer_loop_add(timeout, _e_screensaver_idle_timeout_cb, (void*)1);
}
#endif
}
@ -238,7 +238,7 @@ _e_screensaver_handler_powersave_cb(void *data EINA_UNUSED, int type EINA_UNUSED
if (_e_screensaver_suspend_timer)
ecore_timer_del(_e_screensaver_suspend_timer);
_e_screensaver_suspend_timer =
ecore_timer_add(e_config->screensaver_suspend_delay,
ecore_timer_loop_add(e_config->screensaver_suspend_delay,
_e_screensaver_suspend_cb, NULL);
}
return ECORE_CALLBACK_PASS_ON;
@ -257,7 +257,7 @@ _e_screensaver_handler_screensaver_on_cb(void *data EINA_UNUSED, int type EINA_U
}
if (e_config->screensaver_suspend)
_e_screensaver_suspend_timer =
ecore_timer_add(e_config->screensaver_suspend_delay,
ecore_timer_loop_add(e_config->screensaver_suspend_delay,
_e_screensaver_suspend_cb, NULL);
last_start = ecore_loop_time_get();
_e_screensaver_ask_presentation_count = 0;
@ -288,7 +288,7 @@ _e_screensaver_handler_screensaver_off_cb(void *data EINA_UNUSED, int type EINA_
_e_screensaver_ask_presentation_count = 0;
#ifdef HAVE_WAYLAND
if (_e_screensaver_timeout && (e_comp->comp_type == E_PIXMAP_TYPE_WL))
_e_screensaver_timer = ecore_timer_add(_e_screensaver_timeout, _e_screensaver_idle_timeout_cb, (void*)1);
_e_screensaver_timer = ecore_timer_loop_add(_e_screensaver_timeout, _e_screensaver_idle_timeout_cb, (void*)1);
#endif
return ECORE_CALLBACK_PASS_ON;
}
@ -499,7 +499,7 @@ e_screensaver_eval(Eina_Bool saver_on)
if (t < 1.0) t = 1.0;
E_FREE_FUNC(screensaver_idle_timer, ecore_timer_del);
if (e_config->screensaver_enable)
screensaver_idle_timer = ecore_timer_add
screensaver_idle_timer = ecore_timer_loop_add
(t, _e_screensaver_idle_timer_cb, NULL);
if (e_backlight_mode_get(NULL) != E_BACKLIGHT_MODE_DIM)
{
@ -543,10 +543,10 @@ e_screensaver_notidle(void)
if (e_screensaver_on_get())
{
ecore_event_add(E_EVENT_SCREENSAVER_OFF_PRE, NULL, NULL, NULL);
_e_screensaver_timer = ecore_timer_add(0.2, _e_screensaver_idle_timeout_cb, NULL);
_e_screensaver_timer = ecore_timer_loop_add(0.2, _e_screensaver_idle_timeout_cb, NULL);
}
else if (_e_screensaver_timeout)
_e_screensaver_timer = ecore_timer_add(_e_screensaver_timeout, _e_screensaver_idle_timeout_cb, (void*)1);
_e_screensaver_timer = ecore_timer_loop_add(_e_screensaver_timeout, _e_screensaver_idle_timeout_cb, (void*)1);
#endif
}

@ -489,7 +489,7 @@ e_shelf_toggle(E_Shelf *es, int show)
{
_e_shelf_cb_instant_hide_timer(es);
es->hide_timer =
ecore_timer_add(es->cfg->hide_timeout,
ecore_timer_loop_add(es->cfg->hide_timeout,
_e_shelf_cb_hide_urgent_timer, es);
}
else
@ -517,7 +517,7 @@ e_shelf_toggle(E_Shelf *es, int show)
es->hidden = 1;
if (!es->instant_timer)
es->instant_timer =
ecore_timer_add(es->instant_delay,
ecore_timer_loop_add(es->instant_delay,
_e_shelf_cb_instant_hide_timer, es);
}
else
@ -530,7 +530,7 @@ e_shelf_toggle(E_Shelf *es, int show)
es->hidden = 1;
if (es->hide_timer) ecore_timer_del(es->hide_timer);
es->hide_timer =
ecore_timer_add(es->cfg->hide_timeout,
ecore_timer_loop_add(es->cfg->hide_timeout,
_e_shelf_cb_hide_animator_timer, es);
}
}
@ -1926,7 +1926,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
if (es->autohide_timer)
ecore_timer_reset(es->autohide_timer);
else
es->autohide_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es);
es->autohide_timer = ecore_timer_loop_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es);
}
if (inside)
{
@ -2143,7 +2143,7 @@ end:
{
es->hidden = 1;
if (!es->hide_timer)
es->hide_timer = ecore_timer_add(es->cfg->hide_timeout, _e_shelf_cb_hide_animator_timer, es);
es->hide_timer = ecore_timer_loop_add(es->cfg->hide_timeout, _e_shelf_cb_hide_animator_timer, es);
}
if (es->hidden && (!es->hide_timer))
edje_object_signal_emit(es->o_base, "e,state,hidden", "e");

@ -283,7 +283,7 @@ static void
_e_smart_value_update(E_Smart_Data *sd)
{
if (sd->set_timer) ecore_timer_del(sd->set_timer);
sd->set_timer = ecore_timer_add(0.05, _e_smart_set_timer, sd);
sd->set_timer = ecore_timer_loop_add(0.05, _e_smart_set_timer, sd);
}
static void

@ -348,7 +348,7 @@ _e_spectrum_update(E_Spectrum *sp)
if (!sp || !sp->cv) return;
if (sp->draw_timer) ecore_timer_del(sp->draw_timer);
sp->draw_timer = ecore_timer_add(.001, _e_spectrum_redraw, sp);
sp->draw_timer = ecore_timer_loop_add(.001, _e_spectrum_redraw, sp);
}
Evas_Object *

@ -130,7 +130,7 @@ _e_sys_comp_emit_cb_wait(E_Sys_Action a, const char *sig, const char *rep, Eina_
if (rep)
{
if (action_timeout) ecore_timer_del(action_timeout);
action_timeout = ecore_timer_add(ACTION_TIMEOUT, (Ecore_Task_Cb)_e_sys_comp_action_timeout, (intptr_t*)(long)a);
action_timeout = ecore_timer_loop_add(ACTION_TIMEOUT, (Ecore_Task_Cb)_e_sys_comp_action_timeout, (intptr_t*)(long)a);
}
}
@ -429,7 +429,7 @@ _e_sys_systemd_exists_cb(void *data EINA_UNUSED, const Eldbus_Message *m, Eldbus
fail:
systemd_works = EINA_FALSE;
/* delay this for 1.0 seconds while the rest of e starts up */
ecore_timer_add(1.0, _e_sys_cb_timer, NULL);
ecore_timer_loop_add(1.0, _e_sys_cb_timer, NULL);
}
static void
@ -485,7 +485,7 @@ _e_sys_susp_hib_check(void)
ecore_timer_del(_e_sys_susp_hib_check_timer);
_e_sys_susp_hib_check_last_tick = ecore_time_unix_get();
_e_sys_susp_hib_check_timer =
ecore_timer_add(0.1, _e_sys_susp_hib_check_timer_cb, NULL);
ecore_timer_loop_add(0.1, _e_sys_susp_hib_check_timer_cb, NULL);
}
/* local subsystem functions */
@ -589,7 +589,7 @@ static void
_e_sys_cb_logout_wait(void *data EINA_UNUSED, E_Dialog *dia)
{
if (_e_sys_logout_timer) ecore_timer_del(_e_sys_logout_timer);
_e_sys_logout_timer = ecore_timer_add(0.5, _e_sys_cb_logout_timer, NULL);
_e_sys_logout_timer = ecore_timer_loop_add(0.5, _e_sys_cb_logout_timer, NULL);
_e_sys_logout_begin_time = ecore_time_get();
e_object_del(E_OBJECT(dia));
_e_sys_logout_confirm_dialog = NULL;
@ -748,7 +748,7 @@ _e_sys_logout_begin(E_Sys_Action a_after, Eina_Bool raw)
/* and poll to see if all pending windows are gone yet every 0.5 sec */
_e_sys_logout_begin_time = ecore_time_get();
if (_e_sys_logout_timer) ecore_timer_del(_e_sys_logout_timer);
_e_sys_logout_timer = ecore_timer_add(0.5, _e_sys_cb_logout_timer, NULL);
_e_sys_logout_timer = ecore_timer_loop_add(0.5, _e_sys_cb_logout_timer, NULL);
}
static void

@ -33,7 +33,7 @@ e_test(void)
_e_test_internal();
#ifdef DESKMIRROR_TEST
ecore_timer_add(2.0, deskmirror_test, NULL);
ecore_timer_loop_add(2.0, deskmirror_test, NULL);
#endif
}
@ -48,14 +48,14 @@ _e_test_timer(void *data)
{
e_menu_deactivate(m);
e_object_del(E_OBJECT(m));
ecore_timer_add(0.05, _e_test_timer, NULL);
ecore_timer_loop_add(0.05, _e_test_timer, NULL);
return 0;
}
m = e_int_menus_main_new();
e_menu_activate_mouse(m,
eina_list_data_get(e_comp->zones),
0, 0, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
ecore_timer_add(0.05, _e_test_timer, m);
ecore_timer_loop_add(0.05, _e_test_timer, m);
return 0;
}
@ -131,7 +131,7 @@ _e_test_internal(void)
e_menu_activate_mouse(m,
eina_list_data_get(e_comp->zones),
0, 0, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
ecore_timer_add(0.02, _e_test_timer, m);
ecore_timer_loop_add(0.02, _e_test_timer, m);
}
#elif 0
@ -230,13 +230,13 @@ _e_test_timer(void *data)
if (data == NULL)
{
dia = _e_test_dia(tcon);
ecore_timer_add(0.2, _e_test_timer, dia);
ecore_timer_loop_add(0.2, _e_test_timer, dia);
}
else
{
dia = data;
e_object_del(E_OBJECT(dia));
ecore_timer_add(0.2, _e_test_timer, NULL);
ecore_timer_loop_add(0.2, _e_test_timer, NULL);
}
return 0;
}
@ -744,7 +744,7 @@ _e_test_internal(void)
static void
_e_test_internal(void)
{
ecore_timer_add(1.0, _e_test_timer, c);
ecore_timer_loop_add(1.0, _e_test_timer, c);
}
#elif 0
@ -811,7 +811,7 @@ _e_test_timer(void *data)
static void
_e_test_internal(void)
{
ecore_timer_add(1.0, _e_test_timer, c);
ecore_timer_loop_add(1.0, _e_test_timer, c);
}
#elif 0
@ -878,7 +878,7 @@ _e_test_timer(void *data)
static void
_e_test_internal(void)
{
ecore_timer_add(1.0, _e_test_timer, c);
ecore_timer_loop_add(1.0, _e_test_timer, c);
}
#else

@ -469,7 +469,7 @@ static void
_e_thumb_thumbnailers_kill(void)
{
if (_kill_timer) ecore_timer_del(_kill_timer);
_kill_timer = ecore_timer_add(1.0, _e_thumb_cb_kill, NULL);
_kill_timer = ecore_timer_loop_add(1.0, _e_thumb_cb_kill, NULL);
}
static void

@ -237,7 +237,7 @@ _e_ipc_cb_server_data(void *data EINA_UNUSED,
eth->sigsrc = sigsrc;
if (key) eth->key = strdup(key);
_thumblist = eina_list_append(_thumblist, eth);
if (!_timer) _timer = ecore_timer_add(0.001, _e_cb_timer, NULL);
if (!_timer) _timer = ecore_timer_loop_add(0.001, _e_cb_timer, NULL);
}
}
break;
@ -289,7 +289,7 @@ _e_cb_timer(void *data EINA_UNUSED)
free(eth->key);
free(eth);
if (_thumblist) _timer = ecore_timer_add(0.01, _e_cb_timer, NULL);
if (_thumblist) _timer = ecore_timer_loop_add(0.01, _e_cb_timer, NULL);
else _timer = NULL;
}
else