From 9138b484d1eefe6649d072a9ff4cdba657652183 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 28 Jul 2015 12:31:22 -0400 Subject: [PATCH] fix desklock-related screensaver modification ref T2609 --- src/bin/e_desklock.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index ec5932e23..0b8a458aa 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -429,9 +429,12 @@ _e_desklock_cb_idle_poller(void *data EINA_UNUSED) if ((_e_custom_desklock_exe) || (_e_desklock_state)) return ECORE_CALLBACK_RENEW; #ifndef HAVE_WAYLAND_ONLY - idle = ecore_x_screensaver_idle_time_get(); -#else - idle = e_comp_wl_idle_time_get(); + if (e_comp->comp_type == E_PIXMAP_TYPE_X) + idle = ecore_x_screensaver_idle_time_get(); +#endif +#ifdef HAVE_WAYLAND + if (e_comp->comp_type == E_PIXMAP_TYPE_WL) + idle = e_comp_wl_idle_time_get(); #endif max = e_config->desklock_autolock_idle_timeout; @@ -491,17 +494,15 @@ _e_desklock_ask_presentation_no(void *data EINA_UNUSED, E_Dialog *dia) static void _e_desklock_ask_presentation_no_increase(void *data EINA_UNUSED, E_Dialog *dia) { -#ifndef HAVE_WAYLAND_ONLY - int timeout, interval, blanking, expose; + int timeout, blanking, expose; _e_desklock_ask_presentation_count++; timeout = e_config->screensaver_timeout * _e_desklock_ask_presentation_count; - interval = e_config->screensaver_interval; blanking = e_config->screensaver_blanking; expose = e_config->screensaver_expose; - ecore_x_screensaver_set(timeout, interval, blanking, expose); -#endif + e_screensaver_attrs_set(timeout, blanking, expose); + e_screensaver_update(); e_object_del(E_OBJECT(dia)); }