From 4cf555f36e40c118db6fce7430ccc86c79ec0aba Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 6 Feb 2017 15:59:25 -0600 Subject: [PATCH] Replace all timer_reset with timer_loop_reset Another sed bomb - didn't occur to me first time around to check for this. Cleans up more clock_gettime calls. --- src/bin/e_bryce.c | 4 ++-- src/bin/e_comp_x.c | 4 ++-- src/bin/e_fm.c | 10 +++++----- src/bin/e_fm/e_fm_ipc.c | 2 +- src/bin/e_int_menus.c | 4 ++-- src/bin/e_pointer.c | 2 +- src/bin/e_randr2.c | 2 +- src/bin/e_shelf.c | 2 +- src/modules/conf_applications/e_int_config_apps.c | 2 +- src/modules/fileman/e_fwin.c | 2 +- src/modules/ibar/e_mod_main.c | 8 ++++---- src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c | 2 +- src/modules/pager/e_mod_main.c | 2 +- src/modules/pager/gadget/pager.c | 2 +- src/modules/pager_plain/e_mod_main.c | 2 +- src/modules/quickaccess/e_mod_quickaccess.c | 4 ++-- src/modules/tasks/e_mod_main.c | 2 +- src/modules/teamwork/e_mod_tw.c | 4 ++-- src/modules/tiling/e_mod_tiling.c | 2 +- src/modules/time/clock.c | 4 ++-- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c index 7fd223b84..1d57fcb02 100644 --- a/src/bin/e_bryce.c +++ b/src/bin/e_bryce.c @@ -301,7 +301,7 @@ _bryce_autohide_hide(Bryce *b) { if (b->autohide_blocked) return; if (b->autohide_timer) - ecore_timer_reset(b->autohide_timer); + ecore_timer_loop_reset(b->autohide_timer); else b->autohide_timer = ecore_timer_loop_add(1.0, (Ecore_Task_Cb)_bryce_autohide_timeout, b); } @@ -501,7 +501,7 @@ _bryce_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event if (size && (b->size != size)) { if (b->save_timer) - ecore_timer_reset(b->save_timer); + ecore_timer_loop_reset(b->save_timer); else b->save_timer = ecore_timer_loop_add(0.5, _bryce_moveresize_save, b); } diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 6fd584b2d..c52d4592e 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1482,7 +1482,7 @@ _e_comp_x_show(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Windo if (!ec) { if (c->x_comp_data->retry_timer) - ecore_timer_reset(c->x_comp_data->retry_timer); + ecore_timer_loop_reset(c->x_comp_data->retry_timer); else 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); @@ -2877,7 +2877,7 @@ static void _e_comp_x_focus_timer(void) { if (focus_timer) - ecore_timer_reset(focus_timer); + ecore_timer_loop_reset(focus_timer); else /* focus has changed twice in .002 seconds; .01 seconds should be more than enough delay */ focus_timer = ecore_timer_loop_add(0.01, _e_comp_x_focus_timer_cb, NULL); } diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index e2f5e09e9..b20371f59 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -2883,7 +2883,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) * dramatically improve load times */ ecore_timer_interval_set(sd->scan_timer, 1.5); - ecore_timer_reset(sd->scan_timer); + ecore_timer_loop_reset(sd->scan_timer); } } if (path[0] != 0) @@ -2919,7 +2919,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) if (sd->scan_timer) { ecore_timer_interval_set(sd->scan_timer, 0.0001); - ecore_timer_reset(sd->scan_timer); + ecore_timer_loop_reset(sd->scan_timer); } else { @@ -5960,7 +5960,7 @@ _e_fm2_typebuf_match(Evas_Object *obj, int next) } while (0) ; - if (sd->typebuf.timer) ecore_timer_reset(sd->typebuf.timer); + if (sd->typebuf.timer) ecore_timer_loop_reset(sd->typebuf.timer); else sd->typebuf.timer = ecore_timer_loop_add(3.5, _e_fm_typebuf_timer_cb, sd); return ic_match; } @@ -7023,7 +7023,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event) (Ecore_Cb)_e_fm2_cb_dnd_selection_notify_post_mount_fail, (Ecore_Cb)_e_fm2_cb_dnd_selection_notify_post_umount, NULL, vol); - if (sd->drop_icon->mount_timer) ecore_timer_reset(sd->drop_icon->mount_timer); + if (sd->drop_icon->mount_timer) ecore_timer_loop_reset(sd->drop_icon->mount_timer); 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) || @@ -7481,7 +7481,7 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped EINA_UNUSED) ic->drag.dnd = EINA_FALSE; 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); + if (ic->drag.dnd_end_timer) ecore_timer_loop_reset(ic->drag.dnd_end_timer); 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 diff --git a/src/bin/e_fm/e_fm_ipc.c b/src/bin/e_fm/e_fm_ipc.c index abaef6d7e..0a85560fe 100644 --- a/src/bin/e_fm/e_fm_ipc.c +++ b/src/bin/e_fm/e_fm_ipc.c @@ -1370,7 +1370,7 @@ e_fm_ipc_volume_add(E_Volume *v) int msg_size; if (_init_timer && (!_init_timer_run)) - ecore_timer_reset(_init_timer); + ecore_timer_loop_reset(_init_timer); else if ((!_init_timer) && (!_init_timer_run)) _init_timer = ecore_timer_loop_add(2.0, _e_fm_ipc_timer_cb, NULL); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 2439827c3..f4d20c5ab 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -911,7 +911,7 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir) e_object_del_attach_func_set(E_OBJECT(mn), NULL); if (_e_int_menus_app_cleaner) - ecore_timer_reset(_e_int_menus_app_cleaner); + ecore_timer_loop_reset(_e_int_menus_app_cleaner); else _e_int_menus_app_cleaner = ecore_timer_loop_add(300, _e_int_menus_app_cleaner_cb, NULL); eina_stringshare_del(dir); @@ -955,7 +955,7 @@ _e_int_menus_apps_start(void *data, E_Menu *m) } if (!menu) return; if (_e_int_menus_app_cleaner) - ecore_timer_reset(_e_int_menus_app_cleaner); + ecore_timer_loop_reset(_e_int_menus_app_cleaner); eina_stringshare_del(dir); _e_int_menus_apps_scan(m, menu); if (m->pre_activate_cb.func == _e_int_menus_apps_start) diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index 9e2e43117..34a2227e1 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -129,7 +129,7 @@ _e_pointer_active_handle(E_Pointer *ptr) { _e_pointer_active(ptr); if (ptr->idle_tmr) - ecore_timer_reset(ptr->idle_tmr); + ecore_timer_loop_reset(ptr->idle_tmr); else { E_FREE_FUNC(ptr->idle_poll, ecore_poller_del); diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c index 4d427f3c7..28c1c8da4 100644 --- a/src/bin/e_randr2.c +++ b/src/bin/e_randr2.c @@ -1105,7 +1105,7 @@ e_randr2_screen_refresh_queue(Eina_Bool lid_event) // delay handling of screen shances as they can come in in a series over // time and thus we can batch up responding to them by waiting 1.0 sec if (_screen_delay_timer) - ecore_timer_reset(_screen_delay_timer); + ecore_timer_loop_reset(_screen_delay_timer); else _screen_delay_timer = ecore_timer_loop_add(1.0, _cb_screen_change_delay, NULL); event_screen |= !!lid_event; diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index e2d1fb317..36191c050 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -1924,7 +1924,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event) if (inside) { if (es->autohide_timer) - ecore_timer_reset(es->autohide_timer); + ecore_timer_loop_reset(es->autohide_timer); else es->autohide_timer = ecore_timer_loop_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es); } diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index c358e438a..377d37212 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -217,7 +217,7 @@ static Eina_Bool _cache_update() { if (cache_timer) - ecore_timer_reset(cache_timer); + ecore_timer_loop_reset(cache_timer); else cache_timer = ecore_timer_loop_add(1.0, _cache_update_timer, NULL); return ECORE_CALLBACK_RENEW; diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 2b7f7105b..0ecd5a55c 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -361,7 +361,7 @@ _e_fwin_dnd_change_cb(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event_in { drag_fwin = fwin; if (fwin->spring_timer) - ecore_timer_reset(fwin->spring_timer); + ecore_timer_loop_reset(fwin->spring_timer); else fwin->spring_timer = ecore_timer_loop_add(fileman_config->view.spring_delay, (Ecore_Task_Cb)_e_fwin_spring_cb, fwin); } diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index d9240a3ed..1ebd5445f 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -863,7 +863,7 @@ _ibar_cb_icon_menu_client_menu_del(void *data, Evas *e EINA_UNUSED, Evas_Object evas_object_event_callback_del(obj, EVAS_CALLBACK_HIDE, _ibar_cb_icon_menu_client_menu_del); if (!b->menu_icon) return; if (b->menu_icon->hide_timer) - ecore_timer_reset(b->menu_icon->hide_timer); + ecore_timer_loop_reset(b->menu_icon->hide_timer); else b->menu_icon->hide_timer = ecore_timer_loop_add(0.5, _ibar_cb_out_hide_delay, b->menu_icon); } @@ -1231,7 +1231,7 @@ _ibar_icon_menu_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA if (e_comp_util_mouse_grabbed()) return; if (ic->hide_timer) - ecore_timer_reset(ic->hide_timer); + ecore_timer_loop_reset(ic->hide_timer); else ic->hide_timer = ecore_timer_loop_add(0.5, _ibar_cb_out_hide_delay, ic); } @@ -1515,7 +1515,7 @@ _ibar_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (!ic->ibar->inst->ci->dont_icon_menu_mouseover) { if (ic->show_timer) - ecore_timer_reset(ic->show_timer); + ecore_timer_loop_reset(ic->show_timer); else ic->show_timer = ecore_timer_loop_add(0.2, _ibar_icon_mouse_in_timer, ic); } @@ -1546,7 +1546,7 @@ _ibar_cb_icon_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U if (!ic->ibar->inst->ci->dont_icon_menu_mouseover) { if (ic->hide_timer) - ecore_timer_reset(ic->hide_timer); + ecore_timer_loop_reset(ic->hide_timer); else ic->hide_timer = ecore_timer_loop_add(0.75, _ibar_cb_out_hide_delay, ic); } diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c b/src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c index 7c07490f1..9460cb696 100644 --- a/src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c +++ b/src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c @@ -194,7 +194,7 @@ _ecore_pa_time_restart(pa_time_event *event, const struct timeval *tv) else { ecore_timer_interval_set(event->timer, interval); - ecore_timer_reset(event->timer); + ecore_timer_loop_reset(event->timer); } } diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 9caf79e05..2306e2ed7 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -1015,7 +1015,7 @@ _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev else pp = _pager_popup_new(ev->desk->zone, 0); if (pp->timer) - ecore_timer_reset(pp->timer); + ecore_timer_loop_reset(pp->timer); else pp->timer = ecore_timer_loop_add(pager_config->popup_speed, _pager_popup_cb_timeout, pp); diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index b11c4e9c2..d974aa490 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -930,7 +930,7 @@ _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev else pp = pager_popup_new(0); if (pp->timer) - ecore_timer_reset(pp->timer); + ecore_timer_loop_reset(pp->timer); else pp->timer = ecore_timer_loop_add(pager_config->popup_speed, _pager_popup_cb_timeout, pp); diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index 106f33eed..ed0ea4eb7 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -1691,7 +1691,7 @@ _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev else pp = _pager_popup_new(ev->desk->zone, 0); if (pp->timer) - ecore_timer_reset(pp->timer); + ecore_timer_loop_reset(pp->timer); else pp->timer = ecore_timer_loop_add(pager_config->popup_speed, _pager_popup_cb_timeout, pp); diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c index 6d7ae8f11..11a1eb359 100644 --- a/src/modules/quickaccess/e_mod_quickaccess.c +++ b/src/modules/quickaccess/e_mod_quickaccess.c @@ -947,7 +947,7 @@ _e_qa_dia_del(void *data EINA_UNUSED) { qa_mod->help_dia = NULL; if (qa_mod->help_timeout) - ecore_timer_reset(qa_mod->help_timeout); + ecore_timer_loop_reset(qa_mod->help_timeout); else qa_mod->help_timeout = ecore_timer_loop_add(20.0, _e_qa_help_timeout, NULL); } @@ -1247,7 +1247,7 @@ _e_qa_help3(void *data EINA_UNUSED) e_dialog_show(dia); qa_mod->help_timer = ecore_timer_loop_add(1, _e_qa_help_timer_cb, NULL); - ecore_timer_reset(qa_mod->help_timeout); + ecore_timer_loop_reset(qa_mod->help_timeout); ecore_timer_freeze(qa_mod->help_timeout); e_object_free_attach_func_set(E_OBJECT(qa_mod->demo_dia), _e_qa_demo_dia_del); diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index 3e3c55335..985233d55 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -474,7 +474,7 @@ _tasks_refill_all(void) if (e_drag_current_get()) { if (task_refill_timer) - ecore_timer_reset(task_refill_timer); + ecore_timer_loop_reset(task_refill_timer); else task_refill_timer = ecore_timer_loop_add(0.5, _refill_timer, NULL); return; diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index b3d8be73c..90aa397c1 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -504,7 +504,7 @@ tw_link_hide(E_Client *ec, const char *uri) { if (EINA_DBL_NONZERO(tw_config->mouse_out_delay)) { - if (tw_hide_timer) ecore_timer_reset(tw_hide_timer); + if (tw_hide_timer) ecore_timer_loop_reset(tw_hide_timer); else tw_hide_timer = ecore_timer_loop_add(tw_config->mouse_out_delay, tw_hide, NULL); } else @@ -1124,7 +1124,7 @@ tw_handler_hide(void) if (tw_mod->force || tw_mod->sticky) return; if (EINA_DBL_NONZERO(tw_config->mouse_out_delay)) { - if (tw_hide_timer) ecore_timer_reset(tw_hide_timer); + if (tw_hide_timer) ecore_timer_loop_reset(tw_hide_timer); else tw_hide_timer = ecore_timer_loop_add(tw_config->mouse_out_delay, tw_hide, NULL); } else diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c index 69f6cc8ea..915dc7054 100644 --- a/src/modules/tiling/e_mod_tiling.c +++ b/src/modules/tiling/e_mod_tiling.c @@ -894,7 +894,7 @@ _tiling_split_type_changed_popup(void) { if (desk != _G.split_popup.desk) e_comp_object_util_center_on_zone(comp_obj, e_zone_current_get()); - ecore_timer_reset(_G.split_popup.timer); + ecore_timer_loop_reset(_G.split_popup.timer); } diff --git a/src/modules/time/clock.c b/src/modules/time/clock.c index 4a6e5563e..81a6d8b85 100644 --- a/src/modules/time/clock.c +++ b/src/modules/time/clock.c @@ -382,7 +382,7 @@ _clock_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNU if (inst->cfg->advanced) { _clock_timer(NULL); - ecore_timer_reset(clock_timer); + ecore_timer_loop_reset(clock_timer); } _eval_instance_size(inst); } @@ -512,7 +512,7 @@ time_config_update(Config_Item *ci) advanced |= inst->cfg->advanced; if (!inst->cfg->advanced) continue; _clock_timer(NULL); - ecore_timer_reset(clock_timer); + ecore_timer_loop_reset(clock_timer); } _eval_instance_size(inst); }