diff options
| author | Tormod Volden <debian.tormod@gmail.com> | 2015-07-21 18:16:06 (GMT) |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2015-07-21 18:16:06 (GMT) |
| commit | 79dff7655455327ee5b7376149fa2975fea3e0b9 (patch) | |
| tree | 07eb9dd6d9eebd51661d9ee11e0ef77f463115e5 | |
| parent | ad6b9cbee756efba6a716cc3f124af6231fdfe92 (diff) | |
Detect lightdm session in xscreensaver-wrapper.sh
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778470
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/xscreensaver-wrapper.sh | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4ae0067..a42e64f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ xscreensaver (5.33-1) UNRELEASED; urgency=low lenny->squeeze and potato->woody transitions * Do not overwrite user-configured /etc/X11/app-defaults/XScreenSaver Thanks to Bastien Roucariès for initial patch (Closes: #767019) - * Replace GNOME with MATE in desktop files stub (Closes: #766880) + * Replace GNOME with MATE in desktop files stub (Closes: #766880, #774539) * debian/copyright: Use unique short names for "other" licenses + * xscreensaver-wrapper.sh: Detect if launched from lightdm session + Thanks to Alexander Gerasiov for patch (Closes: #778470) -- Tormod Volden <debian.tormod@gmail.com> Sun, 19 Jul 2015 11:50:31 +0200 diff --git a/debian/xscreensaver-wrapper.sh b/debian/xscreensaver-wrapper.sh index e105a7f..35aeb33 100755 --- a/debian/xscreensaver-wrapper.sh +++ b/debian/xscreensaver-wrapper.sh @@ -1,7 +1,14 @@ #!/bin/sh -if [ -n "$GDMSESSION" ] && which gdmflexiserver > /dev/null; then - echo "XScreenSaver.newLoginCommand: gdmflexiserver -ls" | xrdb -merge +if [ -n "$GDMSESSION" ]; then + case "$XDG_GREETER_DATA_DIR" in + *lightdm*) + which dm-tool > /dev/null && echo "XScreenSaver.newLoginCommand: dm-tool switch-to-greeter" | xrdb -merge + ;; + *) + which gdmflexiserver > /dev/null && echo "XScreenSaver.newLoginCommand: gdmflexiserver -ls" | xrdb -merge + ;; + esac fi if [ -n "$KDE_FULL_SESSION" ] && which kdmctl > /dev/null; then |