1 files changed, 21 insertions, 0 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 787abc6..60fa4f8 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -49,12 +49,14 @@ using namespace Opie::Core;
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
+#include <qfile.h>
+#include <qtextstream.h>
 
 /* STD */
 #include <device.h>
 
 namespace OpieTooth {
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
@@ -121,12 +123,31 @@ namespace OpieTooth {
         }
     }
 
     int BluezApplet::setBluezStatus(int c, bool sync) {
 
         if ( c == 1 ) {
+            QFile cfg("/etc/sysconfig/bluetooth");
+            if ( cfg.open( IO_ReadOnly ) ) {
+                QTextStream stream( &cfg );
+                QString streamIn = stream.read();
+                QStringList list = QStringList::split( "\n", streamIn );
+                cfg.close();
+                if ( list.grep( "BLUETOOTH_PORT=" ).count() > 0 &&
+                     list.grep( "BLUETOOTH_PROTOCOL=" ).count() > 0 &&
+                     list.grep( "BLUETOOTH_SPEED=" ).count() > 0)
+                {
+                    btDevice =
+                        new Device( list.grep( "BLUETOOTH_PORT=" )[0].replace( QString( "BLUETOOTH_PORT=" ), ""),
+                                    list.grep( "BLUETOOTH_PROTOCOL=" )[0].replace( QString( "BLUETOOTH_PROTOCOL=" ), ""),
+                                    list.grep( "BLUETOOTH_SPEED=" )[0].replace( QString( "BLUETOOTH_SPEED=" ), "" ) );
+                    return 0;
+               }
+            }
+
+            // Device-specific stuff - should be removed
             switch ( ODevice::inst()->model() ) {
             case Model_iPAQ_H39xx:
                 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
                 break;
 
             case Model_iPAQ_H5xxx: