[PC-BSD Commits] r7770 - pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager

[svn at pcbsd.org]

Author: kris
Date: 2010-10-10 02:33:52 -0700 (Sun, 10 Oct 2010)
New Revision: 7770

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
Log:

Set device properly for ppp.conf, and filter out .lock / .init devices, not needed in GUI



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-10-09 16:22:14 UTC (rev 7769)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-10-10 09:33:52 UTC (rev 7770)
@@ -238,8 +238,10 @@
 
     dir.setFilter(QDir::Files | QDir::NoDotAndDotDot | QDir::System );
     QStringList list = dir.entryList(QStringList() << "cua*");
-    for (int i = 0; i < list.size(); ++i)
-       comboPPPOEDev->addItem(list.at(i));
+    for (int i = 0; i < list.size(); ++i) {
+      if( list.at(i).indexOf(".lock") == -1 && list.at(i).indexOf(".init") == -1 )
+        comboPPPOEDev->addItem(list.at(i));
+    }
 }
 
 // Function which locates the parent device of a wlan child device
@@ -883,7 +885,7 @@
         // Search for the username and load it
         if ( line.indexOf("set device") != -1 )
    	{
-	    tmp = line.replace("set device ", "").simplified();
+	    tmp = line.replace("set device /dev/", "").simplified();
 	    for ( int i = 0 ; i < comboPPPOEDev->count() ; i++ )
 		if ( tmp == comboPPPOEDev->itemText(i) )
 		   comboPPPOEDev->setCurrentIndex(i);
@@ -1221,7 +1223,7 @@
 
 		    // Save the default section first
                     streamout << "default:\n  set timeout 180\n";
-                    streamout << "  set device " + DeviceName + "\n";
+                    streamout << "  set device /dev/" + DeviceName + "\n";
 		    if ( ! textDialerAT->toPlainText().isEmpty() ) {
 		      tmp = textDialerAT->toPlainText();
 		      streamout << "  set dial \"" + tmp.simplified() + "\"\n\n";