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

Conflicts:
	recipes/pandora-system/pandora-scripts.bb
	recipes/pandora-system/pandora-scripts/op_bluetooth.sh

diff --combined recipes/pandora-system/pandora-scripts.bb
index d6a94af,cc65f9d..fcc8b19
--- 1/recipes/pandora-system/pandora-scripts.bb
--- 2/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@@ -6,11 -6,10 +6,10 @@@ COMPATIBLE_MACHINE = "omap3-pandora
  DEPENDS = "zenity dbus"
  RDEPENDS = "zenity dbus"
  
 -PR = "r9"
 +PR = "r10"
  
  SRC_URI = " \
            file://op_bright.sh \
-           file://op_bright.desktop \
            file://op_cpuspeed.sh \
            file://op_cpuspeed.desktop \          
            file://op_wifi.sh \
@@@ -23,7 -22,11 +22,12 @@@
            file://op_switchgui.sh \
            file://op_switchgui.desktop \
            file://startnetbooklauncher \
 +          file://startmmenu \          
+           file://op_calibrate.sh \
+           file://op_calibrate.desktop \
+           file://op_datetime.sh \
+           file://op_datetime.desktop \
+           file://gui.conf \
  "
  
  do_install() {
@@@ -34,21 -37,29 +38,27 @@@
            install -m 0755 ${WORKDIR}/op_bluetooth.sh ${D}${prefix}/pandora/scripts/
            install -m 0755 ${WORKDIR}/op_defaultgui.sh ${D}${prefix}/pandora/scripts/
            install -m 0755 ${WORKDIR}/op_switchgui.sh ${D}${prefix}/pandora/scripts/
+           install -m 0755 ${WORKDIR}/op_calibrate.sh ${D}${prefix}/pandora/scripts/
+           install -m 0755 ${WORKDIR}/op_datetime.sh ${D}${prefix}/pandora/scripts/
            
            install -d ${D}${datadir}/applications/
-           install -m 0644 ${WORKDIR}/op_bright.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_cpuspeed.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_wifi.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_bluetooth.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_defaultgui.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_switchgui.desktop ${D}${datadir}/applications/          
- 
+           install -m 0644 ${WORKDIR}/op_calibrate.desktop ${D}${datadir}/applications/
+           install -m 0644 ${WORKDIR}/op_datetime.desktop ${D}${datadir}/applications/
+           
 -
 -
            install -d ${D}${sysconfdir}/xdg/autostart/
            install -m 0644 ${WORKDIR}/op_bluetooth-check.desktop ${D}${sysconfdir}/xdg/autostart/op_bluetooth-check.desktop
  
 -        install -d ${D}${sysconfdir}/pandora/conf/
++          install -d ${D}${sysconfdir}/pandora/conf/
+           install -m 0644 ${WORKDIR}/gui.conf ${D}${sysconfdir}/pandora/conf/gui.conf
+ 
 -
            install -d ${D}${bindir}/
            install -m 0755 ${WORKDIR}/startnetbooklauncher ${D}${bindir}/
 +          install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/          
  }
  
  PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --combined recipes/pandora-system/pandora-scripts/op_bluetooth.sh
index 081d8b4,25fc72f..251137d
--- 1/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
--- 2/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
+++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh
@@@ -2,23 -2,30 +2,24 @@@
  #
  # Released under the GPL
  
 -#if [ $1 ]; then
 -# startup = "$1"
 -# echo $
 -# echo $1
 -#fi
 -
  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