1 files changed, 23 insertions, 12 deletions

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
@@ -79,11 +79,18 @@ void AWLan::commit( void ) {
       setModified( 1 );
 }
 
-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
         << "\""
         << endl;
@@ -93,22 +100,21 @@ bool AWLan::generateDataForCommonFile(
           char Buf[100];
           if( gethostname(Buf, sizeof(Buf) ) == 0 ) {
             Buf[99] = '\0'; // just to make sure
-            S << "  wireless_nick "  
+              TS << "  wireless_nick "  
               << Buf
               << endl;
           }
         } else {
-          S << "  wireless_nick \""  
+            TS << "  wireless_nick \""  
             << Data.NodeName
             << "\""
             << endl;
         }
       }
 
-      char * M;
+        char * M = "Auto";
       switch ( Data.Mode ) {
         case 0 : 
-          M = "Auto";
           break;
         case 1 : 
           M = "Managed";
@@ -118,23 +124,28 @@ bool AWLan::generateDataForCommonFile(
           break;
       }
 
-      S << "  wireless_mode "
+        TS << "  wireless_mode "
         << M
         << endl;
       if( Data.Encrypted ) {
         for( int i = 0; i < 4; i ++ ) {
           if( ! Data.Key[i].isEmpty() ) {
-            S << "  wireless_key"
+              TS << "  wireless_key"
               << i
               << " "
               << Data.Key[i]
               << endl;
           }
         }
-        S << "  wireless_keymode "
+          TS << "  wireless_keymode "
           << ((Data.AcceptNonEncrypted) ? "open" : "restricted")
           << endl;
       }
-      return 0;
+        rvl = 0;
+      }
+      rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr);
+
+      return (rvd == 2 || rvl == 2 ) ? 2 :
+             (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }