12 files changed, 121 insertions, 25 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
index cd7bb4a..63b214e 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
@@ -2,4 +2,14 @@
 #include <resources.h>
+
+#include <OTPeer.h>
 #include <OTDevice.h>
 #include <OTGateway.h>
+#include <Opietooth.h>
+
+#include <qlistbox.h>
+#include <qframe.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qdialog.h>
+
 #include "bluetoothRFCOMMrun.h"
@@ -9,2 +19,4 @@ using Opietooth2::OTDevice;
 using Opietooth2::OTDeviceAddress;
+using Opietooth2::OTScan;
+using Opietooth2::OTPeer;
 
@@ -57,2 +69,5 @@ QString BluetoothRFCOMMRun::setMyState( NetworkSetup *,
  
+          // no longer needed
+          delete Ch;
+
           if( Sys.runAsRoot( S ) ) {
@@ -80,8 +95,2 @@ QString BluetoothRFCOMMRun::setMyState( NetworkSetup *,
 
-#include <qlistbox.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qdialog.h>
-
 RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
@@ -94,2 +103,18 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
     RFCOMMChannel * Ch = 0;
+
+    if( Data->Devices.count() == 0 ) {
+      OTPeer * Peer;
+      int Channel;
+
+      if( OTScan::getDevice( Peer, Channel, OT ) == QDialog::Accepted ) {
+        Ch = new RFCOMMChannel;
+        Ch->BDAddress = Peer->address().toString();
+        Ch->Name = Peer->name();
+        Ch->Channel = Channel;
+        return Ch;
+      }
+      
+      return 0;
+    }
+
     QDialog * Dlg = new QDialog( qApp->mainWidget(), 0, TRUE );
@@ -122,3 +147,6 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
           odebug << "Selected " << Data->Devices[i]->Name << oendl;
-          Ch = Data->Devices[i];
+          Ch = new RFCOMMChannel;
+          Ch->BDAddress = Data->Devices[i]->BDAddress;
+          Ch->Name = Data->Devices[i]->Name;
+          Ch->Channel = Data->Devices[i]->Channel;
           break;
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
index bf8cc59..2dd54ff 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
@@ -209,4 +209,5 @@ short AGPRSDevice::generateFile( SystemFile & SF,
 
-bool AGPRSDevice::openFile( SystemFile & SF ) {
+bool AGPRSDevice::openFile( SystemFile & SF, QStringList & SL ) {
     if( SF.name() == "peers" ) {
+      SL << "/etc" << "ppp" << "peers";
       SF.setPath( 
@@ -217,2 +218,3 @@ bool AGPRSDevice::openFile( SystemFile & SF ) {
     } else if ( SF.name() == "chatscripts" ) {
+      SL << "/etc" << "chatscripts";
       SF.setPath( 
@@ -222,2 +224,3 @@ bool AGPRSDevice::openFile( SystemFile & SF ) {
       return 1;
+      SL << "/etc" << "ppp";
     } else if ( SF.name() == "extra" ) {
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.h b/noncore/settings/networksettings2/gprs/GPRS_NNI.h
index 1060a6e..b5bf1b9 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NNI.h
+++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.h
@@ -26,3 +26,4 @@ public :
 
-      virtual bool openFile( SystemFile & SF );
+      virtual bool openFile( SystemFile & SF,
+                             QStringList & SL );
 
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index 80dcb3d..2714dd5 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -253,3 +253,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
           }
-          updateProfileState( LBI );
+          SLOT_RefreshStates();
         }
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index 0ab0e5b..1bcd95c 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -91,4 +91,5 @@ bool ANetNode::isToplevel( void ) {
 bool ANetNode::openFile( SystemFile & SF, 
-                            ANetNodeInstance * NNI ) {
-    return (NNI ) ? NNI->openFile( SF ) : 0 ;
+                         ANetNodeInstance * NNI,
+                         QStringList & SL ) {
+    return (NNI ) ? NNI->openFile( SF, SL ) : 0 ;
 }
@@ -408,2 +409,3 @@ QString NetworkSetup::setState( Action_t A, bool Force ) {
       case Disable :
+        /*
         if( CurrentState < Disabled ) {
@@ -413,2 +415,3 @@ QString NetworkSetup::setState( Action_t A, bool Force ) {
         }
+        */
 
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 8aebdc0..fa4ab70 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -123,2 +123,6 @@ public:
     //
+    // the function can return a set of folders that should
+    // be created (or perhaps already exist) prior to opening 
+    // the file
+    //
     // if this is the case the file should be (re)opened in append
@@ -126,3 +130,4 @@ public:
     virtual bool openFile( SystemFile &SF,
-                             ANetNodeInstance * NNI );
+                           ANetNodeInstance * NNI,
+                           QStringList & PathToCreate );
 
@@ -261,3 +266,4 @@ public:
     // open proper file identified by S
-    virtual bool openFile( SystemFile & ) 
+    virtual bool openFile( SystemFile &,
+                           QStringList & )
       { return 0; }
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 835c7c3..6b87399 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -338,8 +338,19 @@ QString NetworkSettingsData::generateSettings( void ) {
             { SystemFile SF( (*it) );
+              QStringList SL;
 
-              if( ! CurDevNN->openFile( SF, nniit.current()) ) {
+              if( ! CurDevNN->openFile( SF, nniit.current(), SL) ) {
                 // cannot open
                 S = qApp->translate( "NetworkSettings", 
-                  "<p>Cannot open proper file \"%1\" for node \"%2\"</p>" ).
-                    arg( (*it) ).arg( CurDevNN->name() );
+                  "<p>Cannot build proper file \"%1\" for node \"%2\"</p>" ).
+                    arg( (*it) ).
+                    arg( CurDevNN->name() );
+                return S;
+              }
+
+              if( ! createPath( SL ) ) {
+                S = qApp->translate( "NetworkSettings", 
+                  "<p>Cannot create path \"%1\" for proper file \"%2\" for node \"%3\"</p>" ).
+                    arg( SL.join("/") ).
+                    arg( (*it) ).
+                    arg( CurDevNN->name() );
                 return S;
@@ -381,4 +392,5 @@ QString NetworkSettingsData::generateSettings( void ) {
             SystemFile SF( (*it) );
+            QStringList SL;
 
-            if( CurDevNN->openFile( SF, 0 ) &&
+            if( CurDevNN->openFile( SF, 0, SL ) &&
                 ! SF.path().isEmpty()
@@ -386,2 +398,11 @@ QString NetworkSettingsData::generateSettings( void ) {
 
+              if( ! createPath( SL ) ) {
+                S = qApp->translate( "NetworkSettings", 
+                  "<p>Cannot create path \"%1\" for proper file \"%2\" for node \"%3\"</p>" ).
+                    arg( SL.join("/") ).
+                    arg( (*it) ).
+                    arg( CurDevNN->name() );
+                return S;
+              }
+
               if( ! SF.open() ) {
@@ -389,3 +410,4 @@ QString NetworkSettingsData::generateSettings( void ) {
                   "<p>Cannot open proper file \"%1\" for node \"%2\"</p>" ).
-                    arg( (*it) ).arg( CurDevNN->name() );
+                    arg( (*it) ).
+                    arg( CurDevNN->name() );
                 return S;
@@ -787 +809,24 @@ QList<NetworkSetup> NetworkSettingsData::collectTriggered(
 
+bool NetworkSettingsData::createPath( const QStringList & SL ) {
+
+    QDir D( SL[0] );
+
+    for ( QStringList::ConstIterator it = SL.begin(); 
+          it != SL.end(); 
+          ++it ) {
+
+      printf( "Create %s\n", (*it).latin1() );
+      if( it == SL.begin() )
+        continue;
+
+      if( ! D.exists( *it ) ) {
+        if( ! D.mkdir( *it ) ) {
+      printf( "Failed %s %s\n", D.path().latin1(), (*it).latin1() );
+          return 0;
+        }
+      }
+
+      D.cd( *it );
+    }
+    return 1;
+}
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h
index b9c216d..65b61a3 100644
--- a/noncore/settings/networksettings2/nsdata.h
+++ b/noncore/settings/networksettings2/nsdata.h
@@ -31,2 +31,3 @@ private :
       QList<NetworkSetup> collectTriggered( const QString &Interface );
+      bool createPath( const QStringList & SL );
       bool ForceModified;
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index 8323549..fc30bf8 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -186,3 +186,2 @@ void OTSniffing::SLOT_Trace( bool Run ) {
 void OTSniffing::SLOT_Show( const QString & S ) {
-      printf( "%s\n", S.latin1() );
       Output_TV->setText( Output_TV->text() + S + "\n" );
@@ -379,2 +378,3 @@ OTScan::OTScan( QWidget * parent, OTIcons * _IC ) :
       OT = OTGateway::getOTGateway();
+
       Icons = (_IC ) ? _IC : new OTIcons();
@@ -446,2 +446,10 @@ int OTScan::getDevice( OTPeer *& Peer,
 
+      if( ! OT->isEnabled() ) {
+        QMessageBox::warning( 0,
+            tr("Scanning problem"),
+            tr("Bluetooth not enabled" )
+        );
+        return QDialog::Rejected;
+      }
+
       // check if bluetooth is up
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
index 7286d96..9cdd51e 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
@@ -148,4 +148,5 @@ void APPP::commit( void ) {
 
-bool APPP::openFile( SystemFile & SF ) {
+bool APPP::openFile( SystemFile & SF, QStringList & SL ) {
       if( SF.name() == "peers" ) {
+        SL << "/tmp/ppp" << "peers" ;
         SF.setPath( removeSpaces( 
@@ -154,2 +155,3 @@ bool APPP::openFile( SystemFile & SF ) {
       } else if ( SF.name() == "chatscripts" ) {
+        SL << "/tmp/chatscripts";
         SF.setPath( removeSpaces( 
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.h b/noncore/settings/networksettings2/ppp/ppp_NNI.h
index 76afb21..7830a4a 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.h
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.h
@@ -27,3 +27,3 @@ public :
 
-      virtual bool openFile( SystemFile & Sf );
+      virtual bool openFile( SystemFile & Sf, QStringList &SL );
       short generateFile( SystemFile & TS,
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index 48011ea..77bf9ac 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -5,6 +5,5 @@
 State_t ProfileRun::detectState( void ) { 
-    InterfaceInfo * II = networkSetup()->assignedInterface();
 
-    Log(( "Interface %p %p %p: %d\n", II, 
-            netNode(), netNode()->networkSetup(), (II) ? II->IsUp : 0 ));
+    Log(( "Profile %sabled\n", (Data->Disabled) ? "dis" : "en" ));
+
     if( Data->Disabled ) {