forked from enlightenment/enlightenment
e sys - make timeout for sys loging 3 instead of 15 seconds
this shortens logout timeout for "apps still hanging around" to 3 seconds meaning that within 3 seconds something should complain that logout is taking too long so you know your logout request actually went through... and any app not responding in 3 seconds is likely "bad" (swapped out, hung on blocking i/o or something or doing a "are you sure" dialog thing).
This commit is contained in:
parent
b71f1be074
commit
1f87c6d805
|
@ -46,8 +46,8 @@ static void _e_sys_systemd_exists_cb(void *data, const Eldbus_Message *m, Eldbus
|
||||||
static Eina_Bool systemd_works = EINA_FALSE;
|
static Eina_Bool systemd_works = EINA_FALSE;
|
||||||
static int _e_sys_systemd_inhibit_fd = -1;
|
static int _e_sys_systemd_inhibit_fd = -1;
|
||||||
|
|
||||||
static const int E_LOGOUT_AUTO_TIME = 60;
|
static const int E_LOGOUT_AUTO_TIME = 60.0;
|
||||||
static const int E_LOGOUT_WAIT_TIME = 15;
|
static const int E_LOGOUT_WAIT_TIME = 3.0;
|
||||||
|
|
||||||
static Ecore_Timer *action_timeout = NULL;
|
static Ecore_Timer *action_timeout = NULL;
|
||||||
|
|
||||||
|
@ -672,9 +672,8 @@ _e_sys_cb_logout_timer(void *data EINA_UNUSED)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* it has taken 15 seconds of waiting and we still have apps that
|
// it has taken E_LOGOUT_WAIT_TIME seconds of waiting and we still
|
||||||
* will not go away
|
// have apps that will not go away
|
||||||
*/
|
|
||||||
double now = ecore_loop_time_get();
|
double now = ecore_loop_time_get();
|
||||||
if ((now - _e_sys_logout_begin_time) > E_LOGOUT_WAIT_TIME)
|
if ((now - _e_sys_logout_begin_time) > E_LOGOUT_WAIT_TIME)
|
||||||
{
|
{
|
||||||
|
@ -686,6 +685,7 @@ _e_sys_cb_logout_timer(void *data EINA_UNUSED)
|
||||||
_e_sys_logout_confirm_dialog = dia;
|
_e_sys_logout_confirm_dialog = dia;
|
||||||
e_dialog_title_set(dia, _("Logout problems"));
|
e_dialog_title_set(dia, _("Logout problems"));
|
||||||
e_dialog_icon_set(dia, "system-log-out", 64);
|
e_dialog_icon_set(dia, "system-log-out", 64);
|
||||||
|
_e_sys_logout_confirm_dialog_update(E_LOGOUT_AUTO_TIME);
|
||||||
e_dialog_button_add(dia, _("Logout now"), NULL,
|
e_dialog_button_add(dia, _("Logout now"), NULL,
|
||||||
_e_sys_cb_logout_logout, NULL);
|
_e_sys_cb_logout_logout, NULL);
|
||||||
e_dialog_button_add(dia, _("Wait longer"), NULL,
|
e_dialog_button_add(dia, _("Wait longer"), NULL,
|
||||||
|
@ -693,7 +693,6 @@ _e_sys_cb_logout_timer(void *data EINA_UNUSED)
|
||||||
e_dialog_button_add(dia, _("Cancel Logout"), NULL,
|
e_dialog_button_add(dia, _("Cancel Logout"), NULL,
|
||||||
_e_sys_cb_logout_abort, NULL);
|
_e_sys_cb_logout_abort, NULL);
|
||||||
e_dialog_button_focus_num(dia, 1);
|
e_dialog_button_focus_num(dia, 1);
|
||||||
_e_sys_logout_confirm_dialog_update(E_LOGOUT_AUTO_TIME);
|
|
||||||
elm_win_center(dia->win, 1, 1);
|
elm_win_center(dia->win, 1, 1);
|
||||||
e_win_no_remember_set(dia->win, 1);
|
e_win_no_remember_set(dia->win, 1);
|
||||||
e_dialog_show(dia);
|
e_dialog_show(dia);
|
||||||
|
|
Loading…
Reference in New Issue