Bluetooth didn't quite work for kernel 2.6 based iPAQs in familiar. This

patch fixes that by reading the distro supplied file in /etc/sysconfig.

This patch was submitted by Slavek Banko. Thank you Slavek!

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
@@ -31,48 +31,50 @@
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <opie2/odevice.h>
 #include <opie2/odebug.h>
 #include <opie2/oresource.h>
 #include <opie2/oprocess.h>
 #include <qpe/version.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qapplication.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 <qmessagebox.h>
+#include <qfile.h>
+#include <qtextstream.h>
 
 /* STD */
 #include <device.h>
 
 namespace OpieTooth {
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( AppLnk::smallIconSize() );
         setFixedWidth( AppLnk::smallIconSize() );
 #if OPIE_VERSION < 102010
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
         bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
         bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
         bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" );
 #else
         bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
         bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
         bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
         bluezReceiveOnPixmap = OResource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
 #endif
         startTimer(2000);
         btDevice = 0;
         btManager = 0;
         bluezactive = false;
         bluezDiscoveryActive = false;
@@ -103,48 +105,67 @@ namespace OpieTooth {
     int BluezApplet::position()
     {
         return 6;
     }
 
 
     bool BluezApplet::checkBluezStatus() {
         if (btDevice) {
             if (btDevice->isLoaded() ) {
                 odebug << "btDevice isLoaded" << oendl;
                 return true;
             } else {
                 odebug << "btDevice is NOT loaded" << oendl;
                 return false;
             }
         } else {
             odebug << "btDevice is ZERO" << oendl;
             return false;
         }
     }
 
     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:
                 btDevice = new Device( "/dev/tts/1", "any", "921600" );
                 break;
 
 #if OPIE_VERSION >= 102010
             case Model_MyPal_716:
                 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
                 break;
 #endif
             case Model_HTC_Universal:
                 btDevice = new Device( "/dev/ttyS1", "texas", "115200" );
                 break;
 
             case Model_iPAQ_H22xx:
                 btDevice = new Device( "/dev/tts/3", "any", "921600" );
                 break;
 
             default:
                 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );