OBEX push functionality moved to libbluetooth1.

Made some reformatting in device.cc
In bluezapplet.cpp /etc/init.d/bluetooth is started synchronously if it's called from QCopMessage.

1 files changed, 6 insertions, 10 deletions

diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 40acbd2..2f04d46 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -24,4 +24,3 @@ namespace {
 
-	for( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
-	{
+    for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
 	    owarn << "parsePID: " << (*it).latin1() << oendl;
@@ -37,4 +36,3 @@ namespace {
 	    if( (*it).startsWith("BTS") ) continue;
-	    if( !(*it).startsWith("CSR") )
-	    {
+      if( !(*it).startsWith("CSR") ) {
 		id = (*it).toInt();
@@ -77,9 +75,5 @@ void Device::attach(){
     if ( ODevice::inst()->modelString() == "HX4700" )
-    {
 	*m_process << "-S" << "/etc/bluetooth/TIInit_3.2.26.bts" << "/dev/ttyS1" << "texas";
-    }
     else
-    {
 	*m_process << m_device << m_mode << m_speed;
-    }
     connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
@@ -95,3 +89,3 @@ void Device::attach(){
     }
-  };
+  }
 }
@@ -99,3 +93,5 @@ void Device::detach(){
   delete m_hci;
+  m_hci = 0;
   delete m_process;
+  m_process = 0;
   // kill the pid we got
@@ -104,3 +100,3 @@ void Device::detach(){
     owarn << "killing" << oendl;
-    kill(pid, 9);
+    ::kill(pid, 9);
   }