[oe-commits] org.oe.dev opie-bluetoothapplet cvs: Patch to get BT params from /etc/sysconfig/bluetooth

[pfalcon commit]

opie-bluetoothapplet cvs: Patch to get BT params from /etc/sysconfig/bluetooth 
* instead of hardcoding in C++ code.
* Originally by Slavek Banko, http://handhelds.org/hypermail/opie-devel/29/2946.html
* Submitted upstream as http://opie-bugs.oszine.de/view.php?id=1838

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 08c06c17cd4508d5c2c95e45e3e80a8c1037fbb2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=08c06c17cd4508d5c2c95e45e3e80a8c1037fbb2
Files:
1
packages/opie-bluetoothapplet/files
packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
Diffs:

#
# mt diff -re32f0276cdf5267c8e1f129e41d7fc856fe00518 -r08c06c17cd4508d5c2c95e45e3e80a8c1037fbb2
#
# 
# 
# add_dir "packages/opie-bluetoothapplet/files"
# 
# add_file "packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch"
#  content [a8e5c35cbc152f7d25d36d90cabca66ed13e72bf]
# 
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb"
#  from [fb8bd402f76db6978fbf8f1902f2f44ad58ad789]
#    to [9e69c08c4d3dafe0040fce4094a659f68c3c46ce]
# 
============================================================
--- packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch	a8e5c35cbc152f7d25d36d90cabca66ed13e72bf
+++ packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch	a8e5c35cbc152f7d25d36d90cabca66ed13e72bf
@@ -0,0 +1,40 @@
+--- 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" );
============================================================
--- packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb	fb8bd402f76db6978fbf8f1902f2f44ad58ad789
+++ packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb	9e69c08c4d3dafe0040fce4094a659f68c3c46ce
@@ -1,6 +1,8 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 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"