[PC-BSD Commits] r18405 - pcbsd/current/src-qt4/libpcbsd

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-08-11 14:51:20 +0000 (Sat, 11 Aug 2012)
New Revision: 18405

Modified:
   pcbsd/current/src-qt4/libpcbsd/netif.cpp
Log:
Comment out the changes from the previous commit, not working properly yet - will fix it before turning it on again.



Modified: pcbsd/current/src-qt4/libpcbsd/netif.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/netif.cpp	2012-08-11 14:11:56 UTC (rev 18404)
+++ pcbsd/current/src-qt4/libpcbsd/netif.cpp	2012-08-11 14:51:20 UTC (rev 18405)
@@ -439,20 +439,22 @@
 	    else if(line.contains("}")){eEnd = true; }
 	    
 	    //Save the file by entry temporarily
-	    if(eStart){ tmpEntry = line; inEntry = true; }
-	    else if(eEnd){ tmpEntry.append(" ::: "+line); tmpFileList << tmpEntry; inEntry=false; }	    
-	    else if(inEntry){ tmpEntry.append(" ::: "+line); }
-	    else{ tmpFileList << line; }
+	    //if(eStart){ tmpEntry = line; inEntry = true; }
+	    //else if(eEnd){ tmpEntry.append(" ::: "+line); tmpFileList << tmpEntry; inEntry=false; }	    
+	    //else if(inEntry){ tmpEntry.append(" ::: "+line); }
+	    //else{ tmpFileList << line; }
 	}
 	fileout.close();
     }
     //If the desired SSID already has an entry, remove it from wpa_supplicant.conf
-    if(existingSSID){
+   /* if(existingSSID){
+      qDebug() << "Overwriting Existing configuration for "+SSID;
       QFile tmpFile( "/etc/wpa_supplicant.conf.tmp" );
       if(tmpFile.open(QIODevice::WriteOnly | QIODevice::Text )){
         QTextStream oStr(&tmpFile);
         for(int i=0; i<tmpFileList.length(); i++){
-          if(tmpFileList[i].startsWith("network={")){
+		qDebug() << "tmpFileList[i]:" << tmpFileList[i];
+          if(tmpFileList[i].contains("network={")){
           	  QStringList tmp = tmpFileList[i].split(" ::: ");
             //skip it if the new SSID
             if( !tmp[tmp.indexOf("ssid=")].contains(SSID) ){
@@ -468,6 +470,7 @@
       tmpFile.close();
       Utils::runShellCommand("mv /etc/wpa_supplicant.conf.tmp /etc/wpa_supplicant.conf");
     }
+    */
     // Create the wpa_supplicant file based on saved configuration    
     if ( fileout.open( QIODevice::Append ) ) {
        QTextStream streamout( &fileout );