Merge lp:~gunnarhj/lightdm/lp-1627395 into lp:lightdm

[Gunnar Hjalmarsson]

[Robert Ancell (robert-ancell)]

Sure

review: Approve

=== modified file 'debian/guest-session-auto.sh'
--- debian/guest-session-auto.sh	2015-08-06 02:06:28 +0000
+++ debian/guest-session-auto.sh	2016-09-24 23:44:59 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013-2016 Canonical Ltd
 # Author: Gunnar Hjalmarsson <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -37,7 +37,7 @@
 /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 @@
 			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