[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, shengine, updated. 1.1.0-beta.1-24-g708a531

[Darren Salt]

The following commit has been merged in the shengine branch:
commit 708a5316a1e4a81613915677514b809b6b0faafb
Merge: 08ae1f4aaeba8ac4ffdf3dc95d29735bc4d9fe59 206c5c35ea95c613fac18fb0a1d9dcf7b355f739
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sun Jun 14 21:13:13 2009 +0100

    Merge commit '206c5c3' into shengine

diff --combined etc/acpi/actions/hotkey.sh
index e355718,05b60c9..a3bb8c8
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@@ -67,6 -67,27 +67,6 @@@ handle_bluetooth_toggle() 
      fi
  }
  
 -handle_shengine() {
 -    . /etc/acpi/lib/shengine.sh
 -    if [ -e "$SHENGINE_CTL" ]; then
 -	if [ "$1" = '' ]; then
 -	    cycle_shengine
 -	else
 -	    set_shengine "$1"
 -	fi
 -	if [ "$2" != '' ]; then return; fi
 -	case $(get_shengine) in
 -	    0) notify super_hybrid_engine 'S. H. Engine: Performance'; ;;
 -	    1) notify super_hybrid_engine 'S. H. Engine: Standard'; ;;
 -	    2) notify super_hybrid_engine 'S. H. Engine: Power-saving'; ;;
 -	    255) notify super_hybrid_engine 'S. H. Engine: Automatic'; ;;
 -	    *) notify error 'S. H. Engine unavailable'
 -	esac
 -    else
 -	notify error 'S. H. Engine unavailable'
 -    fi
 -}
 -
  show_camera() {
      if camera_is_on; then
  	notify camera 'Camera Enabled'
@@@ -114,6 -135,10 +114,10 @@@ case $code i
  
      # --/F3 - touchpad toggle
      00000037)
+ 	. /etc/acpi/lib/touchpad.sh
+ 	toggle_touchpad &&
+ 	    notify touchpad 'Touchpad on' ||
+ 	    notify touchpad 'Touchpad off'
  	;;
  
      # --/F4 - resolution change
@@@ -131,7 -156,7 +135,7 @@@
  
      # --/F7 - backlight off
      00000016)
- 	if [ "${FnF_BACKLIGHTOFF:-handle_blank_screen}" != 'NONE' ]; then
+ 	if [ "${FnF_BACKLIGHTOFF}" != 'NONE' ]; then
  	    ${FnF_BACKLIGHTOFF:-handle_blank_screen}
  	fi
  	;;
@@@ -150,21 -175,21 +154,21 @@@
  
      # F7/F10 - mute/unmute speakers
      00000013)
- 	if [ "${FnF_MUTE:-handle_mute_toggle}" != 'NONE' ]; then
+ 	if [ "${FnF_MUTE}" != 'NONE' ]; then
  	    ${FnF_MUTE:-handle_mute_toggle}
  	fi
  	;;
  
      # F8/F11 - decrease volume
      00000014)
- 	if [ "${FnF_VOLUMEDOWN:-handle_volume_down}" != 'NONE' ]; then
+ 	if [ "${FnF_VOLUMEDOWN}" != 'NONE' ]; then
  	    ${FnF_VOLUMEDOWN:-handle_volume_down}
  	fi
  	;;
  
      # F9/F12 - increase volume
      00000015)
- 	if [ "${FnF_VOLUMEUP:-handle_volume_up}" != 'NONE' ]; then
+ 	if [ "${FnF_VOLUMEUP}" != 'NONE' ]; then
  	    ${FnF_VOLUMEUP:-handle_volume_up}
  	fi
  	;;
@@@ -176,7 -201,7 +180,7 @@@
  
      # Soft button 1
      0000001a)
- 	if [ "${SOFTBTN1_ACTION:-handle_blank_screen}" != 'NONE' ]; then
+ 	if [ "${SOFTBTN1_ACTION}" != 'NONE' ]; then
  	    ${SOFTBTN1_ACTION:-handle_blank_screen}
  	fi
  	;;
@@@ -190,14 -215,14 +194,14 @@@
  
      # Soft button 3
      0000001c)
- 	if [ "${SOFTBTN3_ACTION:-handle_camera_toggle}" != 'NONE' ]; then
+ 	if [ "${SOFTBTN3_ACTION}" != 'NONE' ]; then
  	    ${SOFTBTN3_ACTION:-handle_camera_toggle}
  	fi
  	;;
  
      # Soft button 4
      0000001d)
- 	if [ "${SOFTBTN4_ACTION:-handle_bluetooth_toggle}" != 'NONE' ]; then
+ 	if [ "${SOFTBTN4_ACTION}" != 'NONE' ]; then
  	    ${SOFTBTN4_ACTION:-handle_bluetooth_toggle}
  	fi
  	;;

-- 
Maintenance of eeepc-acpi-scripts debian package