devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bf8fde1948ddcd30b8bc8b88414eaec67ef15cd3
commit bf8fde1948ddcd30b8bc8b88414eaec67ef15cd3
Author: Chris Michael <cp.mich...@samsung.com>
Date: Mon Jan 26 14:51:17 2015 -0500
make desklock timeouts work in wayland-only. Fixes T1818
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/bin/e_desklock.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 430e5de..8a72f50 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -425,12 +425,9 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
#ifndef HAVE_WAYLAND_ONLY
idle = ecore_x_screensaver_idle_time_get();
+#else
+ idle = e_comp_wl_idle_time_get();
#endif
- /* FIXME: We need to get the idle time from ecore_wayland or
- * ecore_drm here. The problem is, we do not link to ecore_drm library
- * other than the wl_drm module, and idle_time from ecore_wayland
- * library will only work if the comp->ee is created using
- * ecore_evas_wayland */
max = e_config->desklock_autolock_idle_timeout;
if (_e_desklock_ask_presentation_count > 0)
--
