--- a/samples/powerbtn/powerbtn.sh	2015-08-20 19:15:21.177143030 +0100
+++ b/samples/powerbtn/powerbtn.sh	2015-08-20 19:17:27.118144519 +0100
@@ -13,7 +13,7 @@
 #   XUSER - the name of the user
 #   XAUTHORITY - full pathname of the user's .Xauthority file
 getXuser() {
-        user=`pinky -fw | awk '{ if ($2 == ":'$displaynum'" || $(NF) == ":'$displaynum'" ) { print $1; exit; } }'`
+        user=`pinky -fw | awk '{ if ($2 == "?:'$displaynum'" || $(NF) == "?:'$displaynum'" ) { print $1; exit; } }'`
         if [ x"$user" = x"" ]; then
                 startx=`pgrep -n startx`
                 if [ x"$startx" != x"" ]; then
@@ -51,13 +51,13 @@
 getXconsole
 
 # A list of power management system process names.
-PMS="gnome-power-manager kpowersave xfce4-power-manager"
+PMS="gnome-power-manager kpowersave xfce4-power-manager mate-power-manager"
 PMS="$PMS guidance-power-manager.py dalston-power-applet"
 
 # If one of those is running or any of several others,
 if pidof x $PMS > /dev/null ||
 	( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) ||
-	( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
+	( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pgrep -n kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pgrep -n kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
 	# Get out as the power manager that is running will take care of things.
     exit
 fi