Skip guest warning dialog in MATE (LP: #1627395)

[sojka/lightdm.git] / debian / guest-session-auto.sh

diff --git a/debian/guest-session-auto.sh b/debian/guest-session-auto.sh
index 49c309d1e46afec2a08c59671de83e93b48724cf..6c60dac625f83f686d778e0805757819d8adba8c 100644 (file)
--- a/debian/guest-session-auto.sh
+++ b/debian/guest-session-auto.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013-2016 Canonical Ltd
 # Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -11,12 +11,21 @@
 
 # This script is run via autostart at the launch of a guest session.
 
-TEXTDOMAINDIR=/usr/share/locale-langpack
-TEXTDOMAIN=lightdm
+export TEXTDOMAINDIR=/usr/share/locale-langpack
+export TEXTDOMAIN=lightdm
 
-# disable screen locking
+# disable screen locking (GNOME, Unity)
 gsettings set org.gnome.desktop.lockdown disable-lock-screen true
 
+# disable screen locking (MATE)
+gsettings set org.mate.screensaver lock-enabled false
+
+# disable screenlocking (XFCE, Pantheon)
+gsettings set apps.light-locker light-locker-enabled false
+gsettings set apps.light-locker late-locking false
+gsettings set apps.light-locker lock-on-lid false
+gsettings set apps.light-locker lock-on-suspend false
+
 # info dialog about the temporary nature of a guest session
 dialog_content () {
        TITLE=$(gettext 'Temporary Guest Session')
@@ -28,7 +37,7 @@ USB stick, if you would like to access them again later.')
 /var/guest-data folder.')
        test -w /var/guest-data && TEXT="$TEXT\n\n$para2"
 }
-test -f "$HOME"/.skip-guest-warning-dialog || {
+if [ ! -f "$HOME"/.skip-guest-warning-dialog ] && [ "$XDG_CURRENT_DESKTOP" != 'MATE' ]; then
        if [ "$KDE_FULL_SESSION" = true ] && [ -x /usr/bin/kdialog ]; then
                dialog_content
                TEXT_FILE="$HOME"/.guest-session-kdialog
@@ -49,7 +58,7 @@ test -f "$HOME"/.skip-guest-warning-dialog || {
                        zenity --warning --no-wrap --title="$TITLE" --text="$TEXT"
                } &
        fi
-}
+fi
 
 # run possible local startup commands
 test -f /etc/guest-session/auto.sh && . /etc/guest-session/auto.sh