diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2016-09-28 16:13:41 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2016-09-28 16:13:41 +1300 |
| commit | 8c8f6cd156e1e6d40b1eeb613f644f2df706bb07 (patch) | |
| tree | e66b1faf5359212df94c99f986c3692aa52131bf | |
| parent | 2f4dce81f563f85692807f01e99b5a0a6258f629 (diff) | |
| parent | 5aa48f37988826d4ef3be72f2dfb8f6045c18652 (diff) | |
| download | lightdm-git-8c8f6cd156e1e6d40b1eeb613f644f2df706bb07.tar.gz | |
Don't show guest session dialog in MATE
| -rw-r--r-- | debian/guest-session-auto.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/guest-session-auto.sh b/debian/guest-session-auto.sh index 83775289..6c60dac6 100644 --- 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 @@ -37,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 @@ -58,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 |