1 files changed, 17 insertions, 5 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index f1618ae..39c15ab 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -32,23 +32,27 @@
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
+#include <opie/odevice.h>
+
 #include <qpoint.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include <device.h>
 
+using namespace Opie;
+
 namespace OpieTooth {
 
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( 18 );
         setFixedWidth( 14 );
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
@@ -78,16 +82,24 @@ namespace OpieTooth {
             return false;
         }
     }
 
     int BluezApplet::setBluezStatus(int c) {
 
-        if (c == 1) {
-            btDevice = new Device("/dev/ttySB0", "bcsp", "230400" );
+        if ( c == 1 ) {
+            switch ( ODevice::inst()->model() ) {
+            case Model_iPAQ_H39xx:
+                btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
+                break;
+
+            default:
+                btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
+                break;
+            }
         } else {
-            if (btDevice) {
+            if ( btDevice ) {
                 delete btDevice;
                 btDevice = 0;
             }
        }
         return 0;
     }
@@ -114,14 +126,14 @@ namespace OpieTooth {
             menu->insertItem( tr("Enable Bluetooth"), 1 );
         }
 
         menu->insertItem( tr("Launch manager"), 2 );
 
         menu->insertSeparator(6);
-        menu->insertItem( tr("Signal strength"), signal,  5);
-        menu->insertSeparator(8);
+        //menu->insertItem( tr("Signal strength"), signal,  5);
+        //menu->insertSeparator(8);
 
         if (bluezDiscoveryActive) {
             menu->insertItem( tr("Disable discovery"), 3 );
         } else {
             menu->insertItem( tr("Enable discovery"), 4 );
         }