summaryrefslogtreecommitdiff
path: root/desktop-shell/shell.h
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-06-16 13:56:57 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-06-22 15:19:39 +0300
commitb37ac4006a555d78293eba2146210a461e395ba4 (patch)
treed3acee670e8db39a7ab64124c21354a9dadc69bf /desktop-shell/shell.h
parent0a9d348fd8e9672185dfebefd52e3dfeaa8c68cd (diff)
downloadweston-b37ac4006a555d78293eba2146210a461e395ba4.tar.gz
desktop-shell: remove screensaver support
This is a follow-up for the patch that removed weston-screensaver. The aim is to clean up shell.c a little by removing non-essential components. Vanilla Weston desktop is only a demo, external projects are encouraged to create user-friendly desktop environments. The support for launching a screensaver client and the protocol bindings are removed. With them, all related configuration options are removed, and the manuals are updated accordingly. The screensaver protocol definition is left in desktop-shell.xml for posterity. This does not affect Weston's or desktop-shells ability to put screens to sleep after inactivity. The inactivity timer continues to operate as before. Also screen locking is unaffected. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Acked-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Diffstat (limited to 'desktop-shell/shell.h')
-rw-r--r--desktop-shell/shell.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/desktop-shell/shell.h b/desktop-shell/shell.h
index b7472ead..f76f1810 100644
--- a/desktop-shell/shell.h
+++ b/desktop-shell/shell.h
@@ -173,14 +173,6 @@ struct desktop_shell {
} workspaces;
struct {
- char *path;
- int duration;
- struct wl_resource *binding;
- struct weston_process process;
- struct wl_event_source *timer;
- } screensaver;
-
- struct {
struct wl_resource *binding;
struct wl_list surfaces;
} input_panel;