Merge branch 'master' of git://git.openpandora.org/openpandora.oe

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_bluetooth.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
index 081d8b4..251137d 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@ -7,18 +7,19 @@ INTERFACE="`hciconfig | grep "^hci" | cut -d ':' -f 1`"
 if [ ${1} = "startup" ]; then
        [ -f ~/.op_btenabled ] && sudo /usr/sbin/hciconfig ${INTERFACE} up pscan && sudo /usr/sbin/bluetoothd ||echo "Bluetooth: User has not enabled Bluetooth." 
 else
-
+       
        # Figure out if Bluetooth is running or not
        
        if [ "`hciconfig ${INTERFACE} | grep UP`" ]
        then
-               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i /usr/share/icons/hicolor/32x32/apps/bluetooth.png
+               notify-send -u normal "Bluetooth" "Bluetooth is being disabled..." -i /usr/share/icons/hicolor/32x32/apps/blueman.png
                sudo /usr/sbin/hciconfig ${INTERFACE} down
                rm ~/.op_btenabled
        else
                pgrep bluetoothd
-               if [ $? -ne 1 ]; then
-                       notify-send -u normal "Bluetooth" "Bluetooth is being enabled..." -i /usr/share/icons/hicolor/32x32/apps/bluetooth.png
+               echo $INTERFACE
+                if [ $? -ne 1 ]; then
+                       notify-send -u normal "Bluetooth" "Bluetooth is being enabled..." -i /usr/share/icons/hicolor/32x32/apps/blueman.png
                        sudo /usr/sbin/hciconfig ${INTERFACE} down
                        sudo /usr/sbin/hciconfig ${INTERFACE} up pscan
                        sudo /usr/sbin/bluetoothd