From 305fe639644866ff1b04f912df83f6e3e73ee64a Mon Sep 17 00:00:00 2001 From: Gunnar Hjalmarsson Date: Sun, 25 Sep 2016 01:38:58 +0200 Subject: [PATCH] Skip guest warning dialog in MATE (LP: #1627395) --- debian/guest-session-auto.sh | 6 +++--- 1 file 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 # # 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 -- 2.39.2