--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-01-09 12:26:33.000000000 +0100
+++ /etc/acpi/ati-powermode.sh	2007-02-10 15:20:09.000000000 +0100
@@ -5,9 +5,9 @@
 #
 
 getXuser() {
-        user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+        user=`who | grep -m1 "(:$displaynum." | awk '{print $1}'`
         if [ x"$user" = x"" ]; then
-                user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'`
+                user=`who | grep -m1 "(:$displaynum." | awk '{print $1}'`
         fi
         if [ x"$user" != x"" ]; then
                 userhome=`getent passwd $user | cut -d: -f6`
@@ -17,6 +17,7 @@
         fi
 }
 
+aticonfig='/opt/ati/bin/aticonfig'
 
 grep -q closed /proc/acpi/button/lid/*/state
 if [ $? = 0 ]; then
@@ -46,7 +47,7 @@
 	getXuser;
 	if [ x"$XAUTHORITY" != x"" ]; then
 	    export DISPLAY=":$displaynum"	    
-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
+	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
 	fi
     done
 else
@@ -56,7 +57,8 @@
 	getXuser;
 	if [ x"$XAUTHORITY" != x"" ]; then
 	    export DISPLAY=":$displaynum"
-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
+	    default_state=`su $user -c "$aticonfig --lsp | grep 'default state' | cut -c 3"`
+	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
 	fi
     done
 fi