[Debian-eeepc-devel] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 4a5a23c80e8cab8b0fa291417e4c94ae6e059dbb

[Nico Golde]

The following commit has been merged in the master branch:
commit 4a5a23c80e8cab8b0fa291417e4c94ae6e059dbb
Author: Nico Golde <nion at debian.org>
Date:   Fri Mar 7 18:11:59 2008 +0100

    make the notify function work if osd is not set to yes

diff --git a/actions/hotkey.sh b/actions/hotkey.sh
index c7abd1b..7a45ca3 100755
--- a/actions/hotkey.sh
+++ b/actions/hotkey.sh
@@ -7,16 +7,17 @@
 code=$3
 
 notify() {
-    
-    if [ "x$ENABLE_OSD" = "xno" ]; then
-        exit
-    fi
     echo "$@"  # for /var/log/acpid
     if [ -S /tmp/.X11-unix/X0 ]; then
 	export DISPLAY=:0
 	user=$(who | sed -n '/ (:0[\.0].*)$\| :0 /{s/ .*//p;q}')
 	XAUTHORITY=/home/$user/.Xauthority
 	[ -f $XAUTHORITY ] && export XAUTHORITY
+
+    if [ "x$ENABLE_OSD" = "xno" ]; then
+        exit
+    fi
+
 	killall -q aosd_cat
 	if [ -n "$2" -a -z "$(echo $2 | sed 's/[0-9]//g')" ]; then
 		echo "$@%" | aosd_cat -f 0 -u 100 -o 0 -n "$OSD_FONT" &

-- 
Maintenance of eeepc-acpi-scripts debian package