discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6523f283a686dcbd54fc80e7a9bf8ae2e3c0b534
commit 6523f283a686dcbd54fc80e7a9bf8ae2e3c0b534 Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 29 10:17:28 2014 -0500 fix pager popup delete timer T871 --- src/modules/pager/e_mod_main.c | 16 +++++++--------- src/modules/pager16/e_mod_main.c | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 4d6bbc1..966a741 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -1677,16 +1677,14 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even if ((pager_config->popup) && (!act_popup)) { if ((pp = _pager_popup_find(ev->desk->zone))) - { - ecore_timer_reset(pp->timer); - evas_object_show(pp->popup); - } + evas_object_show(pp->popup); else - { - pp = _pager_popup_new(ev->desk->zone, 0); - pp->timer = ecore_timer_add(pager_config->popup_speed, - _pager_popup_cb_timeout, pp); - } + pp = _pager_popup_new(ev->desk->zone, 0); + if (pp->timer) + ecore_timer_reset(pp->timer); + else + pp->timer = ecore_timer_add(pager_config->popup_speed, + _pager_popup_cb_timeout, pp); } return ECORE_CALLBACK_PASS_ON; diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index ccb5547..449d0ff 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -933,16 +933,14 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even if ((pager_config->popup) && (!act_popup)) { if ((pp = _pager_popup_find(ev->desk->zone))) - { - ecore_timer_reset(pp->timer); - evas_object_show(pp->popup); - } + evas_object_show(pp->popup); else - { - pp = _pager_popup_new(ev->desk->zone, 0); - pp->timer = ecore_timer_add(pager_config->popup_speed, - _pager_popup_cb_timeout, pp); - } + pp = _pager_popup_new(ev->desk->zone, 0); + if (pp->timer) + ecore_timer_reset(pp->timer); + else + pp->timer = ecore_timer_add(pager_config->popup_speed, + _pager_popup_cb_timeout, pp); } return ECORE_CALLBACK_PASS_ON; --
