diff options
3 files changed, 1 insertions, 44 deletions
diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch deleted file mode 100644 index 83ee765b12..0000000000 --- a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- applet.org/bluezapplet.cpp.org 2007-02-11 16:48:06.000000000 +0000 -+++ applet/bluezapplet.cpp 2007-02-11 16:56:57.000000000 +0000 -@@ -52,6 +52,8 @@ - #include <qtimer.h> - #include <qpopupmenu.h> - #include <qmessagebox.h> -+#include <qfile.h> -+#include <qtextstream.h> - - /* STD */ - #include <device.h> -@@ -124,6 +126,28 @@ - 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" ); diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb index f35accf577..f54012285d 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb @@ -4,5 +4,3 @@ PR = "r0" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet" - -# file://sysconfig-bluetooth.patch;patch=1" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index a919c3094b..04756ed77a 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -4,5 +4,4 @@ PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \ - file://sysconfig-bluetooth.patch;patch=1" + ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" |