discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c4024acfd2386b8654a98e0bcc11f5099fe3a906

commit c4024acfd2386b8654a98e0bcc11f5099fe3a906
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jul 27 18:24:34 2015 -0400

    ensure expected screensaver blanking in x11 compositors with HAVE_WAYLAND
---
 src/bin/e_screensaver.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index c80f7e3..291af84 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -479,9 +479,7 @@ e_screensaver_deactivate(void)
      ecore_x_screensaver_reset();
 #endif
 #ifdef HAVE_WAYLAND
-   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-     e_screensaver_eval(0);
-   E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del);
+   e_screensaver_notidle();
 #endif
 }
 
@@ -537,14 +535,15 @@ E_API void
 e_screensaver_notidle(void)
 {
 #ifdef HAVE_WAYLAND
+   if (e_comp->comp_type != E_PIXMAP_TYPE_WL) return;
+   E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del);
    if (e_screensaver_on_get())
      {
-        E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del);
         ecore_event_add(E_EVENT_SCREENSAVER_OFF_PRE, NULL, NULL, NULL);
         _e_screensaver_timer = ecore_timer_add(1.0, 
_e_screensaver_idle_timeout_cb, NULL);
      }
-   else if (_e_screensaver_timer)
-     ecore_timer_reset(_e_screensaver_timer);
+   else
+     _e_screensaver_timer = ecore_timer_add(_e_screensaver_timeout, 
_e_screensaver_idle_timeout_cb, (void*)1);
 #endif
 }
 

-- 


Reply via email to