Updated dependencies

  NS2->app requires OT2Lib and NS2Lib
  OT2Lib requires NS2Lib

  Most plugins only require NS2Lib
  Except
  BTPlugin which requires als OT2Lib

  Also renamed owarn -> odebug

24 files changed, 139 insertions, 137 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
index ef6878a..3df7f5c 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
@@ -15,25 +15,25 @@ BluetoothRFCOMMRun::~BluetoothRFCOMMRun( void ) {
 }
 
 State_t BluetoothRFCOMMRun::detectState( void ) {
 
       if( ! OT ) {
         OT = OTGateway::getOTGateway();
       }
 
       if( deviceNrOfConnection() >= 0 ) {
         return Available;
       }
 
-      owarn << "Bluetooth " 
+      odebug << "Bluetooth " 
             << OT->isEnabled()
             << oendl;
 
       return ( OT->isEnabled() ) ? Off : Unavailable;
 }
 
 QString BluetoothRFCOMMRun::setMyState( NodeCollection *, 
                                       Action_t A, 
                                       bool ) {
 
       if( OT ) {
         OTGateway::getOTGateway();
@@ -110,25 +110,25 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
 
     V->addWidget( L );
     V->addWidget( LB );
 
     Dlg->resize( 100, 100 );
     Dlg->move( 20, 
                (qApp->desktop()->height()-100)/2 );
 
     if( Dlg->exec() == QDialog::Accepted ) {
       unsigned int i = 0;
       for( i = 0; i < Data->Devices.count(); i ++ ) {
         if( LB->isSelected(i) ) {
-          owarn << "Selected " << Data->Devices[i]->Name << oendl;
+          odebug << "Selected " << Data->Devices[i]->Name << oendl;
           Ch = Data->Devices[i];
           break;
         }
       }
     }
 
     delete Dlg;
     return Ch;
 }
 
 QString BluetoothRFCOMMRun::deviceFile( void ) {
     if( deviceNrOfConnection() >= 0 ) {
@@ -138,27 +138,27 @@ QString BluetoothRFCOMMRun::deviceFile( void ) {
     }
     return QString();
 }
 
 int BluetoothRFCOMMRun::deviceNrOfConnection( void ) {
 
     if( ! OT ) {
       OT = OTGateway::getOTGateway();
     }
 
     DeviceNr = -1;
     for( unsigned int i = 0; i < Data->Devices.count(); i ++ ) {
-      owarn << "Check for rfcomm on " 
+      odebug << "Check for rfcomm on " 
             << Data->Devices[i]->BDAddress
             << " "
             << Data->Devices[i]->Channel
             << oendl;
       if( ( DeviceNr = OT->connectedToRFCommChannel( 
               OTDeviceAddress( Data->Devices[i]->BDAddress ),
               Data->Devices[i]->Channel ) ) >= 0 ) {
-        owarn << "Up " 
+        odebug << "Up " 
               << oendl;
         break;
       }
     }
     return DeviceNr;
 }
diff --git a/noncore/settings/networksettings2/bluetooth/config.in b/noncore/settings/networksettings2/bluetooth/config.in
index 398cff1..1a76f96 100644
--- a/noncore/settings/networksettings2/bluetooth/config.in
+++ b/noncore/settings/networksettings2/bluetooth/config.in
@@ -1,4 +1,4 @@
   config NS2BT
     boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)"
     default "n" if NS2
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE && NS2OPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE && NS2OPIETOOTH && LIBBLUEZ_DEP
diff --git a/noncore/settings/networksettings2/config.in b/noncore/settings/networksettings2/config.in
index d2b5f26..0236bab 100644
--- a/noncore/settings/networksettings2/config.in
+++ b/noncore/settings/networksettings2/config.in
@@ -1,18 +1,18 @@
   source noncore/settings/networksettings2/networksettings2/config.in
   source noncore/settings/networksettings2/opietooth2/config.in
   source noncore/settings/networksettings2/opietooth2_applet/config.in
 
 config NS2
-  boolean
+  boolean "opie-networksettings2 application"
   default "y"
   depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE && NS2OPIETOOTH
 
   source noncore/settings/networksettings2/profile/config.in
   source noncore/settings/networksettings2/network/config.in
   source noncore/settings/networksettings2/lancard/config.in
   source noncore/settings/networksettings2/ppp/config.in
   source noncore/settings/networksettings2/wlan/config.in
   source noncore/settings/networksettings2/usb/config.in
   source noncore/settings/networksettings2/irda/config.in
   source noncore/settings/networksettings2/vpn/config.in
   source noncore/settings/networksettings2/bluetooth/config.in
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index 0c3ead6..717d9e9 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -146,25 +146,24 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
           // has radio items as children -> 
           // find selected one 
           it = it->firstChild();
           while( it ) {
             if( ((QCheckListItem *)it)->isOn() ) {
               // this radio is selected -> go deeper
               break;
             }
             it = it->nextSibling();
           }
 
           if( ! it ) {
-            owarn  << "Radio not selected" << oendl;
             TmpIsValid = 0;
             return 0;
           }
 
           // it now contains selected radio
           NN = (*Mapping)[it];
         }
 
         // NN here contains the netnode of the
         // current item -> this node needs to
         // be stored in the collection
         if( NNI == 0 ||
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.cpp b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
index e842b99..cccc71a 100644
--- a/noncore/settings/networksettings2/gprs/GPRSrun.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
@@ -14,45 +14,45 @@ State_t GPRSRun::detectState( void ) {
       NodeCollection * NC = nodeCollection();
       InterfaceInfo * I = NC->assignedInterface();
 
       QDir D("/var/run");
 
       if( I ) {
         // has some pppx attached
         return ( I->IsUp ) ? IsUp : Available;
       }
 
       // check ppp itself and figure out interface
 
-      owarn << "Check for ppp " << NC->name() << oendl;
+      odebug << "Check for ppp " << NC->name() << oendl;
       if( D.exists( QString("ppp-")+removeSpaces(NC->name())+".pid") ) {
         // get pid and check if pppd is still running
         QFile F( D.path()+"/ppp-"+removeSpaces(NC->name())+".pid");
 
-        owarn << "PPP PID " << F.name() << oendl;
+        odebug << "PPP PID " << F.name() << oendl;
         if( F.open( IO_ReadOnly ) ) {
           QTextStream TS(&F);
           QString X = TS.readLine();
           PPPPid = X.toULong();
           int rv;
 
           rv = ::kill( PPPPid, 0 );
           if( rv == 0 ||
               ( rv < 0 && errno == EPERM )
             ) {
             // pppd is still up
             X = TS.readLine();
             I = NSResources->system().findInterface(X);
 
-            owarn << "ppp running : IFace " << X << " = " << (long)I << oendl;
+            odebug << "ppp running : IFace " << X << " = " << (long)I << oendl;
 
             if( I ) {
               NC->assignInterface( I );
               return (I->IsUp) ? IsUp : Available;
             }
 
             return Available;
 
           } else {
             // pppd is down
             PPPPid = 0;
           } 
@@ -79,25 +79,25 @@ QString GPRSRun::setMyState( NodeCollection * NC, Action_t A , bool ) {
         detectState();
       }
       if( PPPPid ) {
         QStringList SL;
 
         SL << "poff"
            << removeSpaces( NC->name() );
 
         if( ! NSResources->system().execAsUser( SL ) ) {
           return QString("Cannot terminate pppd for %1").arg(NC->name());
         }
         NC->assignInterface( 0 );
-        owarn << "ppp stopped " << oendl;
+        odebug << "ppp stopped " << oendl;
         PPPPid = 0;
       }
     }
 
     return QString();
 }
 
 bool GPRSRun::handlesInterface( const QString & S ) {
     return Pat.match( S ) >= 0;
 }
 
 bool GPRSRun::handlesInterface( InterfaceInfo * I ) {
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index c17aa7f..2c93d9d 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -13,39 +13,38 @@ State_t NetworkRun::detectState( void ) {
     }
 
     // had no interface or interface is no longer up -> release
     nodeCollection()->assignInterface( 0 );
 
     return Unknown;
 }
 
 QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
     // we handle UP and DOWN
     InterfaceInfo * II = NC->assignedInterface();
 
+    if( ! II ) {
+      Log(( "no interface assigned." ));
+      return QString();
+    }
+
+    QStringList SL;
+
     if( A == Up ) {
       // we can bring UP if lower level is available
-      QStringList SL;
-      SL << "ifup"
-         << QString().sprintf( "%s=%s-c%d-allowed",
+      SL << "ifup";
+    } else if( A == Down ) {
+      SL << "ifdown";
+    } else {
+      return QString();
+    }
+
+    SL << QString().sprintf( "%s=%s-c%d-allowed",
                         II->Name.latin1(), II->Name.latin1(),
                         nodeCollection()->number() );
-      if( ! NSResources->system().runAsRoot( SL ) ) {
-        return QString("Cannot call %1").arg(SL.join(" "));
-      }
-      return QString();
-    } 
-
-    if( A == Down ) {
-      QStringList SL;
-      if( II ) {
-        SL << "ifdown"
-           << II->Name.latin1();
-        if( !  NSResources->system().runAsRoot( SL ) ) {
-          return QString( "Cannot call %1" ).arg( SL.join( " " ));
-        }
-      } else {
-        Log(( "no interface assigned." ));
-      }
-    } 
+
+    if( ! NSResources->system().runAsRoot( SL ) ) {
+      return QString("Cannot call %1").arg(SL.join(" "));
+    }
+
     return QString();
 }
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index 9680a96..78b6cce 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -100,27 +100,25 @@ NetworkSettings::NetworkSettings( QWidget *parent,
     UpdateTimer->start( 5000 );
     connect( UpdateTimer, SIGNAL( timeout() ),
              this, SLOT( SLOT_RefreshStates() ) );
 
     /* Add QCopChannel */
     connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
              this, SLOT(SLOT_QCopMessage(const QCString&,const QByteArray&)) );
 }
 
 NetworkSettings::~NetworkSettings() {
     QString S;
 
-    owarn << "Dispose NS" << oendl;
     if( NSD.isModified() ) {
-      owarn << "Modified" << oendl;
       S = NSD.saveSettings();
       if( ! S.isEmpty() ) {
         S.insert( 0, "<p>" );
         S.append( "</p>" );
         // problem saving
         QMessageBox::warning(
               0, 
               tr( "Saving setup" ), S );
       }
 
       SLOT_GenerateConfig();
       NSD.setModified( 0 );
@@ -277,30 +275,28 @@ void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) {
     if( NC->description().isEmpty() ) {
       Description_LBL->setText( tr( "<<No description>>" ) );
     } else {
       Description_LBL->setText( NC->description() );
     }
 
     Profile_GB->setTitle( LBI->text() + " : " + NC->stateName() );
 
     bool FrmActive = 1;
     bool IsEnabled = 1;
     int leds = 0;
 
-    owarn << "State " << NC->state() << oendl;
     switch( NC->state() ) {
       case Disabled : // no further work
         IsEnabled = 0;
         FrmActive = 0;
-        owarn << "LEds " << leds << oendl;
         break;
       case Unknown :
       case Unchecked :
       case Unavailable :
         FrmActive = 0;
         break;
       case Off :
         leds = 1;
         break;
       case Available :
         leds = 2;
         break;
@@ -350,25 +346,25 @@ void NetworkSettings::SLOT_GenerateConfig( void ) {
     }
 }
 
 void NetworkSettings::SLOT_Disable( bool T ) {
     QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() );
     QString Msg;
 
     if ( ! LBI ) 
       return;
 
     NodeCollection * NC = NSResources->findConnection( LBI->text() );
 
-    owarn << "Prepare to disable" << oendl;
+    Log(( "Prepare to %sable\n", (T) ? "en" : "dis" ));
     Msg = NC->setState( (T) ? Disable : Enable );
     if( ! Msg.isEmpty() ) {
       Msg.insert( 0, "<p>" );
       Msg.append( "</p>" );
       QMessageBox::warning(
           0, 
           tr( "Activating profile" ),
           Msg );
       return;
     }
 
     // reload new state
diff --git a/noncore/settings/networksettings2/networksettings2/config.in b/noncore/settings/networksettings2/networksettings2/config.in
index b384e18..56e971e 100644
--- a/noncore/settings/networksettings2/networksettings2/config.in
+++ b/noncore/settings/networksettings2/networksettings2/config.in
@@ -1,5 +1,5 @@
 config NS2CORE
-  boolean "opie-networksettings2 (TCP/IP network settings)"
+  boolean "opie-networksettings2 library"
   default "y"
   depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
 
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp
index e642c08..f027d35 100644
--- a/noncore/settings/networksettings2/networksettings2/system.cpp
+++ b/noncore/settings/networksettings2/networksettings2/system.cpp
@@ -63,25 +63,25 @@ int System::runAsRoot( QStringList & S, MyProcess * Prc ) {
     char * usr = getenv("USER");
 
     if( S.count() == 0 ) {
       // loophole to start shell
       return 8888;
     }
     if( usr == 0 || strcmp( usr, "root" ) ) {
       // unknown or non-root user -> use SUDO
       S.prepend( "sudo" );
     }
 
     if( getenv( "NS2TESTMODE" ) ) {
-      owarn << "TESTMODE !!! execute " 
+      odebug << "TESTMODE !!! execute " 
             << S.join( " ") 
             << oendl;
     } else {
       MyProcess * P;
 
       if( Prc ) {
         P = Prc;
       } else {
         P = new MyProcess();
         emit processEvent( tr("Command : ") + S.join( " " ) );
 
         connect( P, 
@@ -97,31 +97,31 @@ int System::runAsRoot( QStringList & S, MyProcess * Prc ) {
         connect( P, 
                  SIGNAL(processExited(MyProcess*) ),
                  this, SLOT
                  (SLOT_ProcessExited(MyProcess*) ) );
       }
 
       P->process() << S;
 
       Log(("Executing %s\n", S.join( " " ).latin1() ));
 
       if( ! P->process().start( OProcess::DontCare, 
                       OProcess::AllOutput ) ) {
-        owarn << "Error starting " << S << oendl;
+        odebug << "Error starting " << S << oendl;
         if( ! Prc )
           delete P;
         // error starting app
         return 0;
       }
-      owarn << "Started " << S << oendl;
+      odebug << "Started " << S << oendl;
     }
 
     // all is fine
     return 1;
 }
 
 int System::execAsUser( QStringList & SL ) {
       MyProcess * P = new MyProcess();
       CurrentQPEUser CU = NSResources->currentUser();
       char * usr = getenv("USER");
 
       if( strcmp( usr, "root" ) == 0 ) {
@@ -261,37 +261,37 @@ void System::probeInterfaces( void ) {
     struct ifreq ifrs;
     InterfaceInfo * IFI;
 
     // flag all as 'down'
     for( QDictIterator<InterfaceInfo> it( ProbedInterfaces ); 
          it.current();
          ++it ) {
       it.current()->IsUp = 0;
     }
 
     sockfd = socket(PF_INET, SOCK_DGRAM, 0);
     if(sockfd == -1) {
-      owarn << "Cannot open INET socket "
+      odebug << "Cannot open INET socket "
             << errno 
             << " "
             << strerror( errno )
             << oendl;
       return;
     }
 
     // read interfaces from /proc/dev/net
     // SIOCGIFCONF does not return ALL interfaces ???!?
     ProcDevNet = new QFile(PROCNETDEV);
     if( ! ProcDevNet->open(IO_ReadOnly) ) {
-      owarn << "Cannot open " 
+      odebug << "Cannot open " 
             << PROCNETDEV
             << " "
             << errno 
             << " "
             << strerror( errno )
             << oendl;
       delete ProcDevNet;
       ProcDevNet =0;
       ::close( sockfd );
       return;
     }
 
@@ -500,25 +500,25 @@ void LogClose( void ) {
         fprintf( logf, "____ CLOSE LOGFILE ____\n");
         if( logf != stderr ) {
           fclose( logf );
         }
         logf = 0;
       }
 }
 
 QString removeSpaces( const QString & X ) {
       QString Y;
       Y = X.simplifyWhiteSpace(); 
       Y.replace( QRegExp(" "), "_" );
-      owarn << X <<  " **" << Y << "**" << oendl;
+      odebug << X <<  " **" << Y << "**" << oendl;
       return Y;
 }
 
 //
 //
 //
 //
 //
 
 MyProcess::MyProcess() : QObject(), StdoutBuffer(), StderrBuffer() {
       P = new OProcess();
       connect( P, 
@@ -539,46 +539,46 @@ MyProcess::MyProcess() : QObject(), StdoutBuffer(), StderrBuffer() {
 MyProcess::~MyProcess() {
       delete P;
 }
 
 void MyProcess::SLOT_Stdout( Opie::Core::OProcess * , char * Buf, int len ) {
       char * LB = (char *)alloca( len + 1 );
       memcpy( LB, Buf, len );
       LB[len] = '\0';
 
       // now input is zero terminated
       StdoutBuffer += LB;
 
-      owarn << "Received " << len << " bytes on stdout" << oendl;
+      odebug << "Received " << len << " bytes on stdout" << oendl;
       // see if we have some lines (allow empty lines)
       QStringList SL = QStringList::split( "\n", StdoutBuffer, TRUE );
 
       for( unsigned int i = 0; i < SL.count()-1; i ++ ) {
         Log(( "Stdout : \"%s\"\n", SL[i].latin1() ) );
         emit stdoutLine( SL[i] );
       }
 
       // last line is rest
       StdoutBuffer = SL[ SL.count()-1 ];
 }
 
 void MyProcess::SLOT_Stderr( Opie::Core::OProcess * , char * Buf, int len ) {
       char * LB = (char *)alloca( len + 1 );
       memcpy( LB, Buf, len );
       LB[len] = '\0';
 
       // now input is zero terminated
       StderrBuffer += LB;
 
-      owarn << "Received " << len << " bytes on stderr" << oendl;
+      odebug << "Received " << len << " bytes on stderr" << oendl;
       // see if we have some lines (allow empty lines)
       QStringList SL = QStringList::split( "\n", StderrBuffer, TRUE );
 
       for( unsigned int i = 0; i < SL.count()-1; i ++ ) {
         Log(( "Stderr : \"%s\"\n", SL[i].latin1() ) );
         emit stderrLine( SL[i] );
       }
 
       // last line is rest
       StderrBuffer = SL[ SL.count()-1 ];
 }
 
diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
index 8deef94..1b1988e 100644
--- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp
+++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
@@ -90,34 +90,34 @@ bool SystemFile::open( void ) {
         if( F ) {
           F->close();
           delete F;
         }
 
         F = new QFile( Prefix + Path + ((InAppend)?"":"bup") );
         Log(( "Open systemfile %s\n", F->name().latin1() ));
         if( ! F->open( ((InAppend)?IO_Append : 0 ) | IO_WriteOnly ) ) {
           return 0;
         }
       } else {
         if( ! F ) {
-          owarn << "!!!!!!!!!!!!!!!!!! " << oendl;
-          owarn << "!!!! TESTMODE !!!!" << oendl;
-          owarn << "!!!!!!!!!!!!!!!!!! " << oendl;
-          owarn << "!!!!" << oendl;
-          owarn << "!!!! GENERATE " << Path << oendl;
+          odebug << "!!!!!!!!!!!!!!!!!! " << oendl;
+          odebug << "!!!! TESTMODE !!!!" << oendl;
+          odebug << "!!!!!!!!!!!!!!!!!! " << oendl;
+          odebug << "!!!!" << oendl;
+          odebug << "!!!! GENERATE " << Path << oendl;
           if( InAppend ) {
-            owarn << "!!!! In APPEND mode" << oendl;
+            odebug << "!!!! In APPEND mode" << oendl;
           }
-          owarn << "!!!!" << oendl;
-          owarn << "!!!!!!!!!!!!!!!!!!" << oendl;
+          odebug << "!!!!" << oendl;
+          odebug << "!!!!!!!!!!!!!!!!!!" << oendl;
 
           F = new QFile();
           F->open( IO_WriteOnly, stderr );
         }
       }
       setDevice( F );
       return 1;
 }
 
 bool SystemFile::close( void ) {
       if( ! F || ! F->isOpen() ) {
         return 1 ;
@@ -127,25 +127,25 @@ bool SystemFile::close( void ) {
 
       if( Prefix == "stderr" ) {
         return 1;
       }
 
       QString OldP = Prefix + Path + "bup";
 
       F->close();
       delete F;
       F = 0;
 
       if( ! InAppend ) {
-        owarn << "Rename " << OldP << " to " << Path << oendl;
+        odebug << "Rename " << OldP << " to " << Path << oendl;
         return ( rename( OldP.latin1(), Path.latin1() ) >= 0 );
       } 
       return 1;
 }
 
 bool SystemFile::preSection( void ) {
       if( hasPreSection ) {
         QFile Fl( TemplDir + Name + "/presection" );
         if( ! Fl.open( IO_ReadOnly ) )
           return 0; // error
         // copy file to this file
         F->writeBlock( Fl.readAll() );
diff --git a/noncore/settings/networksettings2/opie-networksettings2.postinst b/noncore/settings/networksettings2/opie-networksettings2.postinst
index ce43274..d1d98ac 100755
--- a/noncore/settings/networksettings2/opie-networksettings2.postinst
+++ b/noncore/settings/networksettings2/opie-networksettings2.postinst
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 QTPB=/opt/QtPalmtop/bin
 
 [ ! -L ${QTPB}/networksettings2-request ] && ln -sf ${QTPB}/networksettings2 ${QTPB}/networksettings2-request
 
-qcop QPE/TaskBar "reloadApps()"
+${QTPB}/qcop QPE/TaskBar "reloadApps()"
 
 exit 0
diff --git a/noncore/settings/networksettings2/opietooth2/OTDevice.cpp b/noncore/settings/networksettings2/opietooth2/OTDevice.cpp
index 62f17a0..c6f7d5e 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDevice.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTDevice.cpp
@@ -94,25 +94,25 @@ bool OTDevice::attach(){
       return TRUE;
 }
 
 bool OTDevice::detach(){
 
       if( needsAttach() && m_hciattachPid ) {
         if( m_hciattach ) {
           delete m_hciattach;
           m_hciattach = 0;
         }
 
         if( kill( m_hciattachPid, 9) < 0 ) {
-          owarn << "could not stop " << errno << oendl;
+          odebug << "could not stop " << errno << oendl;
           emit error( tr( "Could not stop process" ) );
           return FALSE;
         }
         m_hciattachPid = 0;
         emit isEnabled( m_deviceNr, 0 );
         m_deviceNr = -1;
       }
 
       return TRUE;
 }
 
 bool OTDevice::isAttached()const{
@@ -159,25 +159,25 @@ void OTDevice::slotStdOut(OProcess* proc, char* , int ) {
           emit isEnabled( m_deviceNr, 1 );
         }
       } 
 }
 
 void OTDevice::slotStdErr(OProcess* proc, char* chars, int len) {
 
       if(proc == m_hciattach && len >= 1 ){
         // collect output
         QCString string( chars, len+1 ); // \0 == +1
         QString m_output;
         m_output.append( string.data() );
-        owarn << m_output << oendl;
+        odebug << m_output << oendl;
       }
 }
 
 pid_t OTDevice::getPidOfHCIAttach( void ) {
 
       if( needsAttach() ) {
         // not yet attached -> perhaps now ?
         // load /proc dir and check if command name contains hciattach
         QRegExp R("[0-9]+");
         QDir ProcDir( "/proc" );
         QFileInfo FI;
         QStringList EL = ProcDir.entryList( QDir::Dirs );
@@ -202,25 +202,25 @@ pid_t OTDevice::getPidOfHCIAttach( void ) {
           }
         }
       }
 
       return 0;
 }
 
 void OTDevice::detectDeviceType( QString & Device,
                                  QString & Mode,
                                  unsigned long & Speed ) {
 
      // detect device type and determine parms
-     owarn << "Detecting device" << oendl;
+     odebug << "Detecting device" << oendl;
      switch ( ODevice::inst()->model() ) {
       case Model_iPAQ_H39xx:
           Device = "/dev/tts/1";
           Mode = "bcsp";
           Speed = 921600;
           NeedsAttach = 1;
           break;
 
       case Model_iPAQ_H5xxx:
           Device = "/dev/tts/1";
           Mode = "any";
           Speed = 921600;
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
index 8bd7919..a7ee662 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
@@ -141,25 +141,25 @@ static MainClassMap_t MainClasses[] = {
     { 5, MapPeripheralClass },
     { 6, 0 }, // special case
     { 63, MapUnclassifiedClass },
     { -1, 0 }
 };
 
 OTDriver::OTDriver( OTGateway * _OT, struct hci_dev_info* di) : QObject( _OT ), Address() {
     OT = _OT;
     IsUp = 0;
     Socket = 0;
 
     init(di);
-    owarn << "Driver " << devname() << oendl;
+    odebug << "Driver " << devname() << oendl;
 
     AutoClose = new QTimer( this );
     connect( AutoClose,
              SIGNAL( timeout() ),
              this,
              SLOT( SLOT_CloseFd() )
            );
 }
 
 OTDriver::~OTDriver() {
     closeSocket();
     SLOT_CloseFd();
@@ -376,48 +376,48 @@ int OTDriver::reset() {
 }
 
 void OTDriver::setUp( bool M )  {
     if( M && ! isUp() ) {
       bringUp();
     } else if( ! M && isUp() ) {
       bringDown();
     }
 }
 
 void OTDriver::bringUp() {
 
-    owarn << "bringUp : " << Dev << oendl;
+    odebug << "bringUp : " << Dev << oendl;
 
     if( ! open() ) {
       return;
     }
 
     if (! isUp()) {
       if( ioctl(fd(), HCIDEVUP, devId()) < 0 ) {
         if( errno != EALREADY ) {
           emit error( tr( "Cannot bring interface %1 up. %2 : %3" ).
               arg( devname() ).
               arg( errno ).
               arg( strerror(errno) ) );
         }
         return;
       }
       // have to wait a bit for the 'up' to become active
       QTimer::singleShot( 3000, this, SLOT( reinit() ) );
     }
 }
 
 void OTDriver::bringDown() {
 
-    owarn << "bringDown : " << Dev << oendl;
+    odebug << "bringDown : " << Dev << oendl;
 
     if( ! open() ) {
       return;
     }
 
     if ( isUp() ) {
       if( ioctl(fd(), HCIDEVDOWN, devId()) < 0 ) {
         if( errno != EALREADY ) {
           emit error( tr( "Cannot bring interface %1 down. %2 : %3" ).
               arg( devname() ).
               arg( errno ).
               arg( strerror(errno) ) );
@@ -652,33 +652,33 @@ QString OTDriver::strType() {
 }
 
 void OTDriver::setFeatures( unsigned char * _f) {
     Features = lmp_featurestostr(_f, NULL, 255);
 }
 
 void OTDriver::setManufacturer(int compid) {
     Manufacturer = bt_compidtostr(compid);
 }
 
 OTHCISocket * OTDriver::openSocket( void ) {
     if( ! Socket ) {
-      owarn << "Open HCI socket to " << devname() << oendl;
+      odebug << "Open HCI socket to " << devname() << oendl;
       Socket = new OTHCISocket( this );
     }
     return Socket;
 }
 
 void OTDriver::closeSocket( void ) {
     if( Socket ) {
-      owarn << "Close HCI socket to " << devname() << oendl;
+      odebug << "Close HCI socket to " << devname() << oendl;
       delete Socket;
       Socket = 0;
     }
 }
 
 QString OTDriver::getPeerName( const OTDeviceAddress & PAddr ) {
       QString S;
       char name[100 ];
 
       if( ! open() ) {
         return QString("N/A");
       }
@@ -704,41 +704,41 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
         return 0;
       }
 
       cr = (struct hci_conn_info_req *)malloc(
                 sizeof(*cr) + sizeof(struct hci_conn_info));
       if (!cr)
         return 0;
 
       bacpy( &(cr->bdaddr), &(Addr.getBDAddr()) );
       cr->type = ACL_LINK;
 
       if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) {
-        owarn << "Get connection info failed" << oendl;
+        odebug << "Get connection info failed" << oendl;
         free(cr);
         return 0;
       }
 
       handle = htobs(cr->conn_info->handle);
 
       free(cr);
 
       memset(&rq, 0, sizeof(rq));
       rq.ogf    = OGF_STATUS_PARAM;
       rq.ocf    = OCF_READ_RSSI;
       rq.cparam = &handle;
       rq.clen   = 2;
       rq.rparam = &rp;
       rq.rlen   = GET_LINK_QUALITY_RP_SIZE;
 
       if (hci_send_req( fd(), &rq, 100) < 0) {
-         owarn << "Get connection info failed" << oendl;
+         odebug << "Get connection info failed" << oendl;
          return 0;
       }
 
       if( rp.status ) {
-        owarn << QString().sprintf("HCI get_link_quality cmd failed (0x%2.2X)", rp.status) << oendl;
+        odebug << QString().sprintf("HCI get_link_quality cmd failed (0x%2.2X)", rp.status) << oendl;
         return 0;
       }
 
       return rp.rssi+50;
 }
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriverList.cpp b/noncore/settings/networksettings2/opietooth2/OTDriverList.cpp
index f703834..e5af742 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriverList.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTDriverList.cpp
@@ -44,25 +44,25 @@ void OTDriverList::update() {
           ::realloc( dl, sizeof( struct hci_dev_list_req ) +
                        ( cur * sizeof(struct hci_dev_req) )
                  );
 
       if( dl == 0 ) {
         // memory problem
         exit(1);
       }
 
       dl->dev_num = cur;
 
       if( ioctl( OT->getSocket(), HCIGETDEVLIST, (void*)dl) ) {
-        owarn << "WARNING : cannot read device list. "
+        odebug << "WARNING : cannot read device list. "
               << errno 
               << strerror( errno ) << oendl;
         return;
       }
 
       // if num == cur perhaps we did not get all devices yet
     } while( dl->dev_num == cur );
 
     if( dl->dev_num != count() ) {
       // new or missing devices
       clear();
 
@@ -70,17 +70,17 @@ void OTDriverList::update() {
       resize( dl->dev_num );
 
       for( cur=0; cur < dl->dev_num; cur ++) {
           memset( &di, 0, sizeof( di ) );
           di.dev_id = (dr+cur)->dev_id;
 
           // get device info 
           if( ioctl( OT->getSocket(), HCIGETDEVINFO, (void*)&di) != 0 )
               continue;  // uh ?
           insert( cur, new OTDriver( OT, &di ) );
       }
 
-      owarn << "Found " << count() << " devices" << oendl;
+      odebug << "Found " << count() << " devices" << oendl;
 
       ::free( dl );
     }
 }
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
index 6531cf6..e8137dd 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
@@ -145,25 +145,25 @@ bool OTGateway::needsEnabling() {
 
 bool OTGateway::isEnabled() {
       if( getOTDevice()->deviceNr() >= 0 &&
           driver( getOTDevice()->deviceNr() )->isUp() )
         return TRUE;
 
       // else check system
       return getOTDevice()->isAttached();
 }
 
 void OTGateway::SLOT_ShowError( const QString & S ) {
 
-      owarn << S << oendl;
+      odebug << S << oendl;
 
       if( ErrorConnectCount > 0 ) {
         // pass error
         emit error( QString( "<p>" ) + S + "</p>" );
         return;
       }
 
       QMessageBox::warning( 0,
           tr("OTGateway error"),
           S );
 }
 
@@ -201,42 +201,42 @@ void OTGateway::timerEvent( QTimerEvent * ) {
             }
           } else {
             // if one driver is unable to provide info
             // we refresh all devices
             updateDrivers();
             return;
           }
         }
       }
 }
 
 void OTGateway::SLOT_Enabled( int id, bool Up ) {
-      owarn << "device " << id << " state " << Up << oendl;
+      odebug << "device " << id << " state " << Up << oendl;
       if( Up ) {
         // device is up -> detect it
         updateDrivers();
         if( (unsigned)id >= AllDrivers.count() ) {
           // to make sure that the driver really IS detected
           AllDrivers[id]->bringUp();
         }
       } // if DOWN device already down
       emit deviceEnabled( Up );
 }
 
 void OTGateway::updateDrivers( void ) {
       OTDriver * D;
 
       AllDrivers.update();
 
-      owarn << "updated drivers. now " << AllDrivers.count() << oendl;
+      odebug << "updated drivers. now " << AllDrivers.count() << oendl;
 
       // connect signals for each driver
       for( unsigned int i = 0;
            i < AllDrivers.count();
            i ++ ) {
         D = AllDrivers[i];
 
         connect( D, 
                  SIGNAL( error( const QString & ) ),
                  this, 
                  SLOT( SLOT_ShowError( const QString & ) )
                );
@@ -256,25 +256,25 @@ void OTGateway::updateDrivers( void ) {
 
       // verify main device too
       if( TheOTDevice )
         TheOTDevice->checkAttach();
 
       // set to default scanning hardware
       setScanWith( 0 );
 
       emit driverListChanged();
 }
 
 void OTGateway::SLOT_DriverDisappeared( OTDriver * D ) {
-      owarn << "Driver " << D->devname() << " when offline" << oendl;
+      odebug << "Driver " << D->devname() << " when offline" << oendl;
       updateDrivers();
 }
 
 void OTGateway::scanNeighbourhood( OTDriver * D ) {
 
       if( Scanning ) {
         stopScanOfNeighbourhood();
       }
 
       if( D ) {
         setScanWith( D );
       }
@@ -309,25 +309,25 @@ OTDriver* OTGateway::findDriver( const OTDeviceAddress & Addr ) {
       for( unsigned int i = 0 ; i < AllDrivers.count(); i ++ ) {
         if( AllDrivers[i]->address() == Addr ) {
           return AllDrivers[i];
         }
       }
       return 0;
 }
 
 void OTGateway::SLOT_PeerDetected( OTPeer * P, bool IsNew ) {
 
       if( IsNew ) {
         // new peer
-        owarn << "New peer " << P->name() << oendl;
+        odebug << "New peer " << P->name() << oendl;
         addPeer( P );
       }
 
       emit detectedPeer( P, IsNew );
 }
 
 void OTGateway::addPeer( OTPeer * P ) {
       AllPeers.resize( AllPeers.size()+1);
       AllPeers.insert( AllPeers.size()-1, P );
       AllPeersModified = 1;
 }
 
@@ -375,32 +375,32 @@ const char * OTGateway::deviceTypeToName( int cls ) {
 }
 
 PANConnectionVector OTGateway::getPANConnections( void ) {
         PANConnectionVector V;
 
         struct bnep_connlist_req req;
         struct bnep_conninfo ci[48];
 
         V.setAutoDelete(TRUE);
 
         int ctl = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_BNEP);
         if (ctl < 0) {
-          owarn << "Failed to open control socket" << oendl;
+          odebug << "Failed to open control socket" << oendl;
           return V;
         }
 
         req.cnum = 48;
         req.ci   = ci;
         if (ioctl(ctl, BNEPGETCONNLIST, &req)) {
-          owarn << "Failed to get connection list" << oendl;
+          odebug << "Failed to get connection list" << oendl;
           ::close( ctl );
           return V;
         }
 
         for ( unsigned i=0; i < req.cnum; i++) {
           V.resize( V.size() + 1 );
           if( ci[i].role == BNEP_SVC_PANU ) {
             // we are the client
             V.insert( V.size()-1, new OTPANConnection(
                             ci[i].device,
                             batostr((bdaddr_t *) ci[i].dst)
                           ) );
diff --git a/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp b/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
index 471c3bf..1997b44 100644
--- a/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
@@ -25,37 +25,37 @@ using namespace Opietooth2;
 OTHCISocket::OTHCISocket( OTDriver * D ) :
                             QObject( D, D->devname() ) {
     BStatusSet = false;
     Driver = D;
     HCIReadNotifier = 0;
 }
 
 OTHCISocket::~OTHCISocket() {
     close();
 }
 
 void OTHCISocket::close() {
-    owarn << "OTHCISocket::close()" << oendl;
+    odebug << "OTHCISocket::close()" << oendl;
     if( HCIReadNotifier ) {
         delete HCIReadNotifier;
     }
 
     if( HCISocket.isValid() ) {
         HCISocket.close();
     }
 }
 
 bool OTHCISocket::open() {
 
-    owarn << "OTHCISocket::open()" << oendl;
+    odebug << "OTHCISocket::open()" << oendl;
     int s;
 
     s = ::socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 
     if (s < 0) {
       emit error( tr( "Error creating socket on %1 : %2 %3").
                     arg( Driver->devname() ).
                     arg( errno ).
                     arg( strerror(errno) )
                 );
       return false;
     }
@@ -142,25 +142,25 @@ void OTHCISocket::slotSocketActivated() {
       unsigned char eventCode = buf[1];
       unsigned char len = buf[2];
 
       if (psize-3 == len) {
 
         QByteArray databuf;
         databuf.duplicate((char*)(buf+3), len);
         emit event(eventCode, databuf);
         if (eventCode == EVT_CMD_STATUS) {
           updateStatus( databuf );
         }
       } else {
-        owarn << "Error reading hci packet: packetSize("
+        odebug << "Error reading hci packet: packetSize("
               << psize
               << ")-3 != dataSize("
               << len
               << ")" 
               << oendl;
       }
     } else if (err == QSocketDevice::NoError) {
       slotConnectionClosed();
     } else {
         HCISocket.close();
         slotSocketError(err);
     }
@@ -174,25 +174,25 @@ void OTHCISocket::updateStatus(const QByteArray& data) {
     Q_UINT16 opcode;
 
     BStatusSet = true;
 
     stream >> status >> dummy >> opcode;
     //kdDebug() << "updatestatus opcode=" << uint32_t(opcode) << endl;
     LastStatus = status;
     LastStatusOgf = cmd_opcode_ogf(opcode);
     LastStatusOcf = cmd_opcode_ocf(opcode);
 }
 
 void OTHCISocket::slotConnectionClosed() {
-    owarn << "HCI connection closed." << oendl;
+    odebug << "HCI connection closed." << oendl;
     emit connectionClosed();
 }
 
 void OTHCISocket::readEvent() {
 
     if (HCIReadNotifier) {
         slotSocketActivated();
     }
 }
 
 bool OTHCISocket::sendCommand( unsigned char ogf,
                                unsigned short ocf, 
@@ -221,53 +221,53 @@ bool OTHCISocket::sendCommand( unsigned char ogf,
 
 bool OTHCISocket::readStatus( unsigned char ogf, 
                               unsigned short ocf, 
                               int *status, 
                               int timeout_ms) {
     QTimer timer;
 
     timer.start(timeout_ms, true);
     BStatusSet = false;
 
     while (timer.isActive() && HCISocket.isValid()) {
 
-        owarn << "OTHCISocket::readStatus()" << oendl;
+        odebug << "OTHCISocket::readStatus()" << oendl;
         bool timeout = false;
 
         if( HCISocket.bytesAvailable() == 0) {
           int rv = HCISocket.waitForMore(timeout_ms);
           timeout = (rv == 0);
         }
 
         if (!timeout) {
           slotSocketActivated();
         }
 
         if( BStatusSet == true && 
             ogf == LastStatusOgf && 
             ocf == LastStatusOcf) {
             *status = LastStatus;
-            owarn << "OTHCISocket::readStatus(ogf="
+            odebug << "OTHCISocket::readStatus(ogf="
                   << ogf
                   << ",ocf="
                   << ocf
                   << ",timeout="
                   << LastStatus
                   << ")"
                   << oendl;
             return true;
         }
     }
 
-    owarn << "OTHCISocket::readStatus(ogf="
+    odebug << "OTHCISocket::readStatus(ogf="
           << ogf
           << ",ocf="
           << ocf
           << ",timeout="
           << LastStatus
           << ") : timeout "
           << oendl;
     return false;
 }
 
 int OTHCISocket::socket() {
     return HCISocket.socket();
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.cpp b/noncore/settings/networksettings2/opietooth2/OTInquiry.cpp
index 8e94bbc..2bc63c7 100644
--- a/noncore/settings/networksettings2/opietooth2/OTInquiry.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.cpp
@@ -50,60 +50,60 @@ OTInquiry::OTInquiry( OTDriver * Drv ) : QObject( Drv ) {
     connect( Socket, 
              SIGNAL( event(unsigned char, QByteArray)),
              this, 
              SLOT(slotHCIEvent(unsigned char, QByteArray)));
 }
 
 OTInquiry::~OTInquiry() {
     stopInquiring();
 }
 
 void OTInquiry::stopInquiring( void ) {
     if( Socket ) {
-      owarn << "Stop inquiry" << oendl;
+      odebug << "Stop inquiry" << oendl;
       Driver->closeSocket();
       Socket = 0;
     }
 }
 
 bool OTInquiry::inquire( double timeout, int numResponses, int lap) {
 
     QByteArray cmdBuf(5);
 
     cmdBuf[0] = lap & 0xFF;
     cmdBuf[1] = (lap >> 8) & 0xFF;
     cmdBuf[2] = (lap >> 16) & 0xFF;
     cmdBuf[3] = max(0x01, min(0x30, int(timeout/1.28)));
     cmdBuf[4] = (unsigned char)numResponses;
 
-    owarn << "Send HCI inquiry command. wait for " << cmdBuf[3] << oendl;
+    odebug << "Send HCI inquiry command. wait for " << cmdBuf[3] << oendl;
 
     Socket->sendCommand(0x01, 0x0001, cmdBuf);
 
     int status;
 
     if( Socket->readStatus(0x01, 0x0001, &status)) {
       if (status == 0) {
         SuccessfullyStarted = true;
         InquiryTimeoutTimer->start( int(1000*(timeout+1.0)), true);
         return true;
       }
       else {
         QString S =QString().sprintf( "%x", status );
-        owarn << "OTInquiry::inquiry() failed: 0x" << S << oendl;
+        odebug << "OTInquiry::inquiry() failed: 0x" << S << oendl;
         emit finished();
         return false;
       }
     } else {
-      owarn << "OTInquiry::inquiry(): Timeout." << oendl;
+      odebug << "OTInquiry::inquiry(): Timeout." << oendl;
       return false;
     }
 }
 
 bool OTInquiry::isInquiring() {
     return InquiryTimeoutTimer->isActive();
 }
 
 bool OTInquiry::isFinished() {
     return SuccessfullyStarted && SuccessfullyEnded;
 }
       
@@ -117,62 +117,62 @@ void OTInquiry::reset() {
 
 
 void OTInquiry::onPeerFound( OTPeer * Peer, bool IsNew ) {
     emit peerFound( Peer, IsNew );
 }
 
 void OTInquiry::slotInquiryTimeout() {
     emit error( tr( "Timeout while waiting for end of inquiry.") );
 }
 
 void OTInquiry::slotHCIEvent(unsigned char eventCode, QByteArray buf) {
 
-    owarn << "OTInquiry: hci packet received: eventCode="
+    odebug << "OTInquiry: hci packet received: eventCode="
           << (unsigned int)eventCode 
           << " packetLength="
           << (unsigned int)buf.size() 
           << oendl;
 
     unsigned char *data = (unsigned char*)buf.data();
     switch (eventCode) {
       case EVT_INQUIRY_COMPLETE:
         { unsigned char status = data[0];
-          owarn << "EVT_INQUIRY_COMPLETE status=" << status << oendl;
+          odebug << "EVT_INQUIRY_COMPLETE status=" << status << oendl;
           InquiryTimeoutTimer->stop();
           if (status == 0) {
             if( SuccessfullyStarted == true) {
-              owarn << "OTInquiry ended successfully" << oendl;
+              odebug << "OTInquiry ended successfully" << oendl;
               SuccessfullyEnded = true;
             }
             emit finished();
           }
           else {
             emit error( tr( "OTInquiry completed with error (code %1)" ).
                           arg(status));
           }
         }
         break;
       case EVT_INQUIRY_RESULT:
         { int numResults = data[0];
           OTPeer * P = 0;
           bool IsNew;
           OTDeviceAddress Addr;
           QString N;
 
           inquiry_info *results = (inquiry_info*)(data+1);
 
           for (int n=0; n<numResults; n++) {
             Addr.setBDAddr( results[n].bdaddr );
 
-            owarn << "INQUIRY_RESULT: "
+            odebug << "INQUIRY_RESULT: "
                   << Addr.toString() 
                   << oendl;
 
             P = Driver->gateway()->findPeer( Addr );
 
             if( P ) {
               // peer known
               if( P->state() != OTPeer::Peer_Up ) {
                 P->setState( OTPeer::Peer_Up );
               }
               IsNew = 0;
             } else {
@@ -194,25 +194,25 @@ void OTInquiry::slotHCIEvent(unsigned char eventCode, QByteArray buf) {
 
             // call the handler. Emits a signal if not overwritten
             onPeerFound( P, IsNew );
 
             // }
           }
         }
         break;
       case EVT_CMD_STATUS :
         { int status = data[0];
           int numHciCmdPkts = data[1];
           int cmdOpcode = *((uint16_t*)(data+2));
-          owarn << "EVT_CMD_STATUS status=" 
+          odebug << "EVT_CMD_STATUS status=" 
                 << status
                 << " numPkts=" 
                 << numHciCmdPkts 
                 << " cmdOpcode="
                 << cmdOpcode 
                 << oendl;
           if (cmdOpcode == OCF_INQUIRY) {
 
           }
         }
         break;
     }
diff --git a/noncore/settings/networksettings2/opietooth2/OTPeer.cpp b/noncore/settings/networksettings2/opietooth2/OTPeer.cpp
index 0d7e943..2272f04 100644
--- a/noncore/settings/networksettings2/opietooth2/OTPeer.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTPeer.cpp
@@ -42,54 +42,54 @@ OTPeer::OTPeer( QTextStream & TS, OTGateway * _OT ) {
       load( TS );
 }
 
 OTPeer::~OTPeer( ) {
 
 }
 
 void OTPeer::updateServices( void ) {
     sdp_session_t *session;
 
     serviceList.clear();
 
-    owarn << "Get services from " << Addr.toString() << oendl;
+    odebug << "Get services from " << Addr.toString() << oendl;
 
     session = sdp_connect( &(OTDeviceAddress::any.getBDAddr()), 
                            &(Addr.getBDAddr()),
                            0);
 
     if (!session) {
-      owarn << "sdp_connect(" 
+      odebug << "sdp_connect(" 
             << Addr.toString()
             << ") failed"  
             << oendl;
         return; // error
     }
 
     uint32_t range = 0x0000ffff;
     sdp_list_t* attrId = sdp_list_append(0, &range);
 
     // search all public features
     uuid_t grp;
     sdp_uuid16_create( &grp, PUBLIC_BROWSE_GROUP );
     sdp_list_t * search = sdp_list_append(0, &grp );
 
     // get data from peer
     sdp_list_t* seq;
     if (sdp_service_search_attr_req( session, 
                                      search,
                                      SDP_ATTR_REQ_RANGE, 
                                      attrId, 
                                      &seq ) ) {
-      owarn << "Service Search failed" << oendl;
+      odebug << "Service Search failed" << oendl;
       sdp_close(session);
       return;
     }
 
     sdp_list_free(attrId, 0);
     sdp_list_free(search, 0);
 
     // process result
     sdp_list_t* next = NULL;
 
     for (; seq; seq = next) {
       sdp_record_t *rec = (sdp_record_t *) seq->data;
@@ -168,25 +168,25 @@ void OTPeer::load( QTextStream & TS ) {
 #define POLLDELAY       1000
 #define PREMAGICNR      (MAGICNR+POLLDELAY)
 
 void OTPeer::findOutState( int timeoutInSec, bool Force ) {
       ProbeFD = -1;
       if( Force && ConnectedTo == 0 ) {
         State = OTPeer::Peer_Unknown;
       } // else keep state or is connected to us
 
       if( State == OTPeer::Peer_Unknown ) {
         ProbePhase = 0;
         ProbeTimeout = timeoutInSec*1000;
-        owarn << "Ping " << address().toString() << oendl;
+        odebug << "Ping " << address().toString() << oendl;
         startTimer( POLLDELAY );
       } else {
         ProbeTimeout = 0;
         startTimer( 0 );
       }
 }
 
 #define PINGSIZE        20
 void OTPeer::timerEvent( QTimerEvent * ev ) {
 
       ProbeTimeout -= POLLDELAY;
 
@@ -226,25 +226,25 @@ void OTPeer::timerEvent( QTimerEvent * ev ) {
               }
             }
             ProbePhase = 1; // wait for connect
             break;
           case 1 :
             { struct pollfd pf[1];
               char buf[L2CAP_CMD_HDR_SIZE + PINGSIZE + 20];
               int n;
 
               pf[0].fd = ProbeFD; 
               pf[0].events = POLLOUT;
               if( (n = ::poll(pf, 1, 0)) < 0 ) {
-                owarn << address().toString()
+                odebug << address().toString()
                       << " : errno " 
                       << errno 
                       << " " 
                       << strerror(errno)<<oendl;
                 ProbeTimeout = 0;
                 break;
               }
 
               if( ! n ) {
                 // not ready -> try again
                 break;
               }
@@ -257,89 +257,89 @@ void OTPeer::timerEvent( QTimerEvent * ev ) {
 
               /* Build command header */
               cmd->code  = L2CAP_ECHO_REQ;
               cmd->ident = *(char *)this; // get some byte
               cmd->len   = PINGSIZE;
 
               /* Send Echo Request */
               if( ::send(ProbeFD, buf, PINGSIZE + L2CAP_CMD_HDR_SIZE, 0) <= 0) {
                 if( errno == EACCES ) {
                   // permission denied means that we could not
                   // connect because the device does not allow us
                   // but it is UP
-                  owarn << address().toString()
+                  odebug << address().toString()
                         << " good send error " 
                         << errno 
                         << " " 
                         << strerror( errno) 
                         << oendl;
                   State = OTPeer::Peer_Up;
                   ProbeTimeout = 0;
                   break;
                 } else if( errno != EBUSY ) {
-                  owarn << address().toString()
+                  odebug << address().toString()
                         << " : errno " 
                         << errno 
                         << " " 
                         << strerror(errno)
                         << oendl;
                   ProbeTimeout = 0;
                   break;
                 } // else want some more
               }
 
               ProbePhase = 2; // wait for ping reply
             }
             break;
           case 2 : // wait for reply
             { struct pollfd pf[1];
               char buf[L2CAP_CMD_HDR_SIZE + PINGSIZE + 20];
               l2cap_cmd_hdr *cmd = (l2cap_cmd_hdr *) buf;
               int n;
 
               pf[0].fd = ProbeFD; 
               pf[0].events = POLLIN;
               if( (n = ::poll(pf, 1, 0)) < 0 ) {
-                owarn << address().toString()
+                odebug << address().toString()
                       << " : errno " 
                       << errno 
                       << " " 
                       << strerror(errno)
                       <<oendl;
                 ProbeTimeout = 0;
                 break;
               }
 
               if( ! n ) {
                 // not ready -> try again
                 break;
               }
 
               if( (n = ::recv( ProbeFD, buf, sizeof(buf), 0)) < 0) {
-                owarn << address().toString()
+                odebug << address().toString()
                       << "errno " 
                       << errno 
                       << " " 
                       << strerror(errno) 
                       << oendl;
                 ProbeTimeout = 0;
                 break;
               }
 
               /* Check for our id */
               if( cmd->ident != *(char *)this )
                 // not our reply
                 break;
 
-              owarn << "reply from " 
+              odebug << "reply from " 
                     << address().toString()
                     << oendl;
               // whatever reply we get is a valid reply 
               State = OTPeer::Peer_Up;
               ProbeTimeout = 0;
             }
             break;
         }
 
         if( State != OTPeer::Peer_Unknown ) {
           ProbeTimeout = 0;
         }
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index b14cc2f..8323549 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -528,25 +528,25 @@ void OTScan::SLOT_Selected( QListViewItem * it ) {
         // store result
         SelectedPeer = ((PeerLVI *)it->parent())->peer();
         SelectedChannel = ((ChannelLVI *)it)->channel();
       } else {
         // click on device
         if( it->depth() != 0 ) {
           return;
         }
 
         SelectedPeer = ((PeerLVI *)it)->peer();
         SelectedChannel = 0;
       }
-      owarn << "Selected " << SelectedPeer->address().toString() <<
+      odebug << "Selected " << SelectedPeer->address().toString() <<
             " Channel " << SelectedChannel << oendl;
       emit selected();
 }
 
 void OTScan::SLOT_FinishedDetecting( ) {
       scanMode( false );
 }
 
 void OTScan::SLOT_CleanupOld( ) {
 
       // iterate over all peers and find those that
       // are down and have no pairing info
@@ -556,66 +556,66 @@ void OTScan::SLOT_CleanupOld( ) {
       QListViewItem * Lit = DetectedPeers_LV->firstChild();
       while( Lit ) {
         TheP = ((PeerLVI *)Lit)->peer();
         if( TheP->state() == OTPeer::Peer_Down ) {
           unsigned int k;
 
           // what about linkkeys ?
           for( k = 0; k < Keys.count(); k ++ ) {
             if( TheP->address() == Keys[k].to() ||
                 TheP->address() == Keys[k].from() 
               ) {
               // part of linkkey
-              owarn << "LINKKEY " << TheP->address().toString() << oendl;
+              odebug << "LINKKEY " << TheP->address().toString() << oendl;
               break;
             }
           }
 
           if( k == Keys.count() ) {
-            owarn << "RM LINKKEY " << TheP->address().toString() << oendl;
+            odebug << "RM LINKKEY " << TheP->address().toString() << oendl;
             // not found -> remember to remove this peer
             QListViewItem * Nit;
             OT->removePeer( TheP );
             Nit = Lit->nextSibling(); 
             delete Lit;
             Lit = Nit;
             continue;
           }
         } else {
-          owarn << "NODOWN " << TheP->address().toString() << oendl;
+          odebug << "NODOWN " << TheP->address().toString() << oendl;
         }
 
         Lit = Lit->nextSibling();
       }
 }
 
 void OTScan::SLOT_NewPeer( OTPeer * P, bool IsNew ){
       PeerLVI * it = 0;
 
       if( IsNew ) {
         it = new PeerLVI( P, DetectedPeers_LV );
       } else {
         // find peer in table
         QListViewItem * Lit = DetectedPeers_LV->firstChild();
         while( Lit ) {
           if( ((PeerLVI *)Lit)->peer() == P ) {
             // this item
             it = (PeerLVI *)Lit;
             break;
           }
           Lit = Lit->nextSibling();
         }
 
         if( ! it ) {
-          owarn << "Should not occur" << oendl;
+          odebug << "Should not occur" << oendl;
           return;
         }
       }
 
       // update/show info
       it->setText( 0, P->name() );
       it->setPixmap(0, Icons->deviceIcon( 
           OT->deviceTypeToName( P->deviceClass() ) ) );
 
       // tell peer to report its state async
       connect( P, 
                SIGNAL( peerStateReport( OTPeer *)),
@@ -920,25 +920,25 @@ void OTManage::SLOT_ShowDriver( QListViewItem * It ) {
         // not toplevel
         return;
 
       DriverLVI * it = (DriverLVI *) It;
       DriverIsUp_CB->setChecked( it->driver()->isUp() );
 }
 
 void OTManage::SLOT_UpDriver( bool Up ) {
       QListViewItem * it = AllDrivers_LV->firstChild();
       while( it ) {
         if( it->isSelected() ) {
           OTDriver * D = ((DriverLVI *)it)->driver();
-          owarn << "UP driver " << D->devname() << oendl;
+          odebug << "UP driver " << D->devname() << oendl;
           // this
           D->setUp( Up );
           return;
         }
         it = it->nextSibling();
       }
 }
 
 void OTManage::SLOT_StateChange( OTDriver * D, bool Up ) {
       QListViewItem * it = AllDrivers_LV->firstChild();
       while( it ) {
         if( ((DriverLVI *)it)->driver() == D ) {
diff --git a/noncore/settings/networksettings2/opietooth2/config.in b/noncore/settings/networksettings2/opietooth2/config.in
index 720f49a..084e8c0 100644
--- a/noncore/settings/networksettings2/opietooth2/config.in
+++ b/noncore/settings/networksettings2/opietooth2/config.in
@@ -1,5 +1,5 @@
 config NS2OPIETOOTH
-  boolean "opie-networksettings2 bluetooth library"
+  boolean "Opietooth2 bluetooth library"
   default "y"
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBBLUEZ_DEP && NS2CORE
 
diff --git a/noncore/settings/networksettings2/opietooth2/libopietooth2.postinst b/noncore/settings/networksettings2/opietooth2/libopietooth2.postinst
index cd605c2..2713c61 100755
--- a/noncore/settings/networksettings2/opietooth2/libopietooth2.postinst
+++ b/noncore/settings/networksettings2/opietooth2/libopietooth2.postinst
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 QTPB=/opt/QtPalmtop/bin
 
 [ ! -L ${QTPB}/networksettings2-opietooth ] && ln -sf ${QTPB}/networksettings2 ${QTPB}/networksettings2-opietooth
 
 # qcop QPE/Taskbar "linkChanged(opietooth)"
-qcop QPE/Taskbar "reloadApps()"
+${QTPB}/qcop QPE/Taskbar "reloadApps()"
 
 exit 0
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
index e0057a9..16277cf 100644
--- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro
+++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
@@ -26,12 +26,19 @@ SOURCES		= OTDevice.cpp \
                   OTIcons.cpp \
                   OTPeer.cpp \
                   OTGateway.cpp \
                   Opietooth.cpp
         INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lbluetooth -lnetworksettings2
         INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
         TARGET  = opietooth2
         VERSION         = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBBLUEZ_INC_DIR ) {
+    INCLUDEPATH += $$LIBBLUEZ_INC_DIR
+}
+!isEmpty( LIBBLUEZ_LIB_DIR ) {
+    LIBS += -L$$LIBBLUEZ_LIB_DIR
+}
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index ab57a00..acb67bd 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -1,25 +1,25 @@
 #include <resources.h>
 
 #include "profilerun.h"
 
 State_t ProfileRun::detectState( void ) { 
     if( Data->Disabled ) {
       return Disabled;
     } 
     return Unknown;
 }
 
 QString ProfileRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
-    owarn << "Profile " << Data->Disabled << oendl;
+    odebug << "Profile " << Data->Disabled << oendl;
     if( A == Disable ) {
       if( ! Data->Disabled ) {
         Data->Disabled = 1;
         NC->setModified( 1 );
       }
     } else if( A == Enable ) {
       if( Data->Disabled ) { 
         Data->Disabled = 0;
         NC->setModified( 1 );
       }
     }
 
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index eb439c1..de8c8a2 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -29,90 +29,91 @@ State_t USBRun::detectState( void ) {
              It.current();
              ++It ) {
           Run = It.current();
           if( X == Run->Name ) {
             NC->assignInterface( Run );
             return IsUp;
           }
         }
       }
     } 
 
     Log(("Assigned %p\n", NC->assignedInterface() ));
+
     if( ( Run = NC->assignedInterface() ) ) {
       // we already have an interface assigned -> still present ?
       if( ! Run->IsUp ) {
         // usb is still free -> keep assignment
         return Available;
       } // else interface is up but NOT us -> some other profile
     }
 
     // nothing (valid) assigned to us
     NC->assignInterface( 0 );
 
     // find possible interface
-    for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
-         It.current();
-         ++It ) {
-      Run = It.current();
-
-      Log(("%s %d %d=%d %d\n",
-          Run->Name.latin1(),
-          handlesInterface( Run->Name ),
-              Run->CardType, ARPHRD_ETHER,
-              ! Run->IsUp ));
-
-      if( handlesInterface( Run->Name ) &&
-          Run->CardType == ARPHRD_ETHER &&
-          ! Run->IsUp
-        ) {
-        // proper type, and Not UP -> free
-        // usb cables are currently always available when requested
-        // until we can detect if we are plugged in
-        return Available;
-      }
+    if( getInterface() ) {
+      // proper type, and Not UP -> free
+      // usb cables are currently always available when requested
+      // until we can detect if we are plugged in
+      return Available;
     }
 
     return Unavailable;
 }
 
 QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
 
-    // nothing needs to be done to 'activate' or 'deactivate' 
-    // a cable
+    InterfaceInfo * I = getInterface();
+
+    if( ! I ) {
+      return QString("No usb device available");
+    }
+
+    Log(( "Grabbed USB interface %s\n", I->Name.latin1() ));
+    // grab this interface
+    NC->assignInterface( I );
+
     return QString();
 }
 
 // get interface that is free or assigned to us
 InterfaceInfo * USBRun::getInterface( void ) {
 
     System & S = NSResources->system();
     InterfaceInfo * best = 0, * Run;
-    QRegExp R( "usb[0-9abcdef]" );
 
     for( QDictIterator<InterfaceInfo> It(S.interfaces());
          It.current();
          ++It ) {
       Run = It.current();
+
+      Log(("%s %d %d=%d %d\n",
+          Run->Name.latin1(),
+          handlesInterface( Run->Name ),
+              Run->CardType, ARPHRD_ETHER,
+              ! Run->IsUp ));
+
       if( handlesInterface( Run->Name ) &&
           Run->CardType == ARPHRD_ETHER
         ) {
         // this is a USB card
         if( Run->assignedConnection() == netNode()->connection() ) {
           // assigned to us
           return Run;
-        } else if( Run->assignedConnection() == 0 ) {
+        } else if( ! Run->IsUp &&
+                   Run->assignedConnection() == 0 ) {
           // free
           best = Run;
-        }
+        } // UP or not assigned to us
       }
     }
     return best; // can be 0
 }
 
 bool USBRun::handlesInterface( const QString & S ) {
     return Pat.match( S ) >= 0;
 }
 
 bool USBRun::handlesInterface( InterfaceInfo * I ) {
     return handlesInterface( I->Name );
 }