[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.1-44-g3f7ad80

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 3f7ad805ebab39c5fb256a84bec558a5938e0e5c
Author: Damyan Ivanov <dmn at debian.org>
Date:   Thu Dec 3 20:08:09 2009 +0200

    wireless.sh/hotkey.sh/functions.sh: wake up wicd on switching WiFi on

diff --git a/debian/changelog b/debian/changelog
index 3045dc4..276057f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ eeepc-acpi-scripts (1.1.3) UNRELEASED; urgency=low
     fixing insserv warning about discrepancy between LSB init.d headers and
     the real situation. Thanks to Paul Menzel for reporting and Raphael
     Geissert for the fix.
+  * hotkey.sh/wireless.sh/functions.sh: wake up wicd on switching WiFi on
 
   [ Andreas Schreiner ]
   * Fix WLAN toggle using fn-F2 on EeePC 900A. This EeePC model needs to
diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index 127d811..0edea65 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -136,6 +136,9 @@ case $code in
 	  /etc/acpi/actions/wireless.sh toggle
 	fi
 	show_wireless
+        if ! /etc/acpi/actions/wireless.sh detect; then
+            wakeup_wicd
+        fi
 	;;
 
     # --/F3 - touchpad toggle
diff --git a/etc/acpi/actions/wireless.sh b/etc/acpi/actions/wireless.sh
index 3bc2d08..848c116 100755
--- a/etc/acpi/actions/wireless.sh
+++ b/etc/acpi/actions/wireless.sh
@@ -23,6 +23,7 @@ case "$cmd" in
     on|enable|1)
 	if [ "$STATE" = 0 ]; then
 	    echo 1 > $wlan_control
+            wakeup_wicd
 	fi
 	;;
     off|disable|0)
diff --git a/functions.sh b/functions.sh
index 838bd84..375564d 100644
--- a/functions.sh
+++ b/functions.sh
@@ -70,3 +70,10 @@ lock_x_screen()
         fi
     fi
 }
+
+wakeup_wicd() {
+    WICD_WAKEUP=/usr/share/wicd/autoconnect.py
+    if [ -x $WICD_WAKEUP ]; then
+        $WICD_WAKEUP
+    fi
+}

-- 
Maintenance of eeepc-acpi-scripts debian package