mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shell: remove remnants of screensaver surface list 

The list became stale probably when the lock_layer was introduced. Now
one less (ab)user of weston_surface::link.

Also add a comment on screensaver_configure(), that it is (and has been)
broken for pre-started screensavers.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-12-20 14:02:13 +02:00 committed by Kristian Høgsberg
parent 26def5ca8e
commit 3a1d07d5e7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shell.c
View File

@ -124,7 +124,6 @@ struct desktop_shell {
char *path;
int duration;
struct wl_resource *binding;
struct wl_list surfaces;
struct weston_process process;
} screensaver;
@ -2257,12 +2256,8 @@ desktop_shell_set_lock_surface(struct wl_client *client,
static void
resume_desktop(struct desktop_shell *shell)
{
struct weston_surface *surface;
struct workspace *ws = get_current_workspace(shell);
wl_list_for_each(surface, &shell->screensaver.surfaces, link)
weston_surface_unmap(surface);
terminate_screensaver(shell);
wl_list_remove(&shell->lock_layer.link);
@ -3155,6 +3150,7 @@ screensaver_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
{
struct desktop_shell *shell = surface->private;
/* XXX: starting weston-screensaver beforehand does not work */
if (!shell->locked)
return;
@ -3846,7 +3842,6 @@ module_init(struct weston_compositor *ec)
ec->shell_interface.move = surface_move;
ec->shell_interface.resize = surface_resize;
wl_list_init(&shell->screensaver.surfaces);
wl_list_init(&shell->input_panel.surfaces);
weston_layer_init(&shell->fullscreen_layer, &ec->cursor_layer.link);