4 files changed, 33 insertions, 54 deletions

diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index ce8a734..e4c3f60 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -40,25 +40,2 @@ const char * WLanNetNode::provides( void ) {
 
-bool WLanNetNode::generateProperFilesFor( 
-            ANetNodeInstance * ) {
-      return 0;
-}
-
-bool WLanNetNode::hasDataFor( const QString & S ) {
-      return S == "interfaces";
-}
-
-bool WLanNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & S, 
-                                long DevNr ) {
-      QString NIC = genNic( DevNr );
-
-      if( S.name() == "interfaces" ) {
-        // generate mapping stanza for this interface
-        S << "# check if " << NIC << " can be brought UP" << endl;
-        S << "mapping " << NIC << endl;
-        S << "  script networksettings2-request" << endl << endl;
-      }
-      return 0;
-}
-
 QString WLanNetNode::genNic( long nr ) { 
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h
index b5ff3fd..c13c05c 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.h
@@ -20,5 +20,3 @@ public:
     virtual const QString nodeDescription() ;
-
     virtual ANetNodeInstance * createInstance( void );
-
     virtual const char ** needs( void );
@@ -26,11 +24,4 @@ public:
 
-    virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-
-    virtual bool hasDataFor( const QString & S );
-    virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & SF, long DevNr );
-
     virtual long instanceCount( void )
       { return InstanceCount; }
-
     virtual QString genNic( long );
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
index 61969f2..0e4fc4c 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
@@ -81,7 +81,14 @@ void AWLan::commit( void ) {
 
-bool AWLan::generateDataForCommonFile( 
-                                SystemFile & S, 
-                                long ) {
+short AWLan::generateFileEmbedded( const QString & ID,
+                                  const QString & Path,
+                                  QTextStream & TS,
+                                  long DevNr ) {
 
-      S << "  wireless_essid \""
+      short rvl, rvd;
+
+      rvl = 1;
+
+      if( ID == "interfaces" ) {
+        Log(("Generate WLanNNI for %s\n", ID.latin1() ));
+        TS << "  wireless_essid \""
         << Data.ESSID
@@ -95,3 +102,3 @@ bool AWLan::generateDataForCommonFile(
             Buf[99] = '\0'; // just to make sure
-            S << "  wireless_nick "  
+              TS << "  wireless_nick "  
               << Buf
@@ -100,3 +107,3 @@ bool AWLan::generateDataForCommonFile(
         } else {
-          S << "  wireless_nick \""  
+            TS << "  wireless_nick \""  
             << Data.NodeName
@@ -107,6 +114,5 @@ bool AWLan::generateDataForCommonFile(
 
-      char * M;
+        char * M = "Auto";
       switch ( Data.Mode ) {
         case 0 : 
-          M = "Auto";
           break;
@@ -120,3 +126,3 @@ bool AWLan::generateDataForCommonFile(
 
-      S << "  wireless_mode "
+        TS << "  wireless_mode "
         << M
@@ -126,3 +132,3 @@ bool AWLan::generateDataForCommonFile(
           if( ! Data.Key[i].isEmpty() ) {
-            S << "  wireless_key"
+              TS << "  wireless_key"
               << i
@@ -133,3 +139,3 @@ bool AWLan::generateDataForCommonFile(
         }
-        S << "  wireless_keymode "
+          TS << "  wireless_keymode "
           << ((Data.AcceptNonEncrypted) ? "open" : "restricted")
@@ -137,3 +143,8 @@ bool AWLan::generateDataForCommonFile(
       }
-      return 0;
+        rvl = 0;
+      }
+      rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr);
+
+      return (rvd == 2 || rvl == 2 ) ? 2 :
+             (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.h b/noncore/settings/networksettings2/wlan/wlan_NNI.h
index 2211c47..a9be65f 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.h
@@ -16,2 +16,7 @@ public :
 
+      RuntimeInfo * runtime( void ) 
+        { return
+            ( RT ) ? RT : ( RT = new WLanRun( this, Data ) );
+        }
+
       QWidget * edit( QWidget * parent );
@@ -20,8 +25,2 @@ public :
 
-      RuntimeInfo * runtime( void ) 
-        { if( RT == 0 ) 
-            RT = new WLanRun( this, Data );
-          return RT;
-        }
-
       virtual void  * data( void ) 
@@ -29,6 +28,7 @@ public :
 
-      virtual bool hasDataFor( const QString & )
-        { return 1; }
-      virtual bool generateDataForCommonFile( 
-          SystemFile & SF, long DevNr );
+      virtual short generateFileEmbedded( const QString & ID,
+                                         const QString & Path,
+                                         QTextStream & TS,
+                                         long DevNr ); 
+
 protected :