[PATCH 2/7] shell: remove unused code from screensaver
Tiago Vignatti
tiago.vignatti at intel.com
Fri Feb 24 08:08:40 PST 2012
The code being removed is actually never triggered due a race with the client
that has just launched. However the client will issue an surface_attach to
the compositor that will run the same routines inside map() later a bit.
Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
src/shell.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/shell.c b/src/shell.c
index ee71dcc..689d735 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1290,7 +1290,6 @@ lock(struct weston_shell *base)
struct weston_surface *cur;
struct weston_surface *tmp;
struct weston_input_device *device;
- struct shell_surface *shsurf;
uint32_t time;
if (shell->locked)
@@ -1323,15 +1322,6 @@ lock(struct weston_shell *base)
launch_screensaver(shell);
- wl_list_for_each(shsurf, &shell->screensaver.surfaces, link)
- show_screensaver(shell, shsurf);
-
- if (!wl_list_empty(&shell->screensaver.surfaces)) {
- shell->compositor->idle_time = shell->screensaver.duration;
- weston_compositor_wake(shell->compositor);
- shell->compositor->state = WESTON_COMPOSITOR_IDLE;
- }
-
/* reset pointer foci */
weston_compositor_repick(shell->compositor);
--
1.7.5.4
More information about the wayland-devel
mailing list