[PC-BSD Commits] r2676 - pcbsd/trunk/NetworkManagerAdmin

[svn at pcbsd.org]

Author: kris
Date: 2008-09-02 10:53:09 -0700 (Tue, 02 Sep 2008)
New Revision: 2676

Modified:
   pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
   pcbsd/trunk/NetworkManagerAdmin/netmanadmin.cpp
Log:

Fixed a bug with PPPoE not being able to save properly



Modified: pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
===================================================================
--- pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2008-09-02 16:44:14 UTC (rev 2675)
+++ pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2008-09-02 17:53:09 UTC (rev 2676)
@@ -21,3 +21,4 @@
 
 TRANSLATIONS = NetworkManagerAdmin_en.ts
 
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/trunk/NetworkManagerAdmin/netmanadmin.cpp
===================================================================
--- pcbsd/trunk/NetworkManagerAdmin/netmanadmin.cpp	2008-09-02 16:44:14 UTC (rev 2675)
+++ pcbsd/trunk/NetworkManagerAdmin/netmanadmin.cpp	2008-09-02 17:53:09 UTC (rev 2676)
@@ -36,6 +36,9 @@
     connect(lineDNS2, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
     connect(lineGateway, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
     connect(lineHostname, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
+    connect(linePPPUsername, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
+    connect(linePPPPassword, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
+    connect(linePPPService, SIGNAL(textChanged(const QString &)), this, SLOT(slotRecheckText(const QString &) ) );    
 
     // Load our device names for the PPOE combo box
     detectDev();
@@ -472,7 +475,6 @@
 {
     
     
-     QFile filein( "/etc/ppp/ppp.conf" );
      int foundProfile = 0;
      QString ProfileName = "internet";
      QString tmp, tmp2;
@@ -496,15 +498,18 @@
 	}
 
 	// Now load the ppp.conf file
+        QString PPPFile = "/etc/ppp/ppp.conf";
+        QFile filein( PPPFile );
 	if ( filein.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &filein );
         QString line;
         while ( !stream.atEnd() ) {
             line = stream.readLine(); // line of text excluding '\n'
 
+
 	    // Check if we are on a profile line
-	    if ( line.indexOf(":") == line.length() -1  ) {
-		if ( line.indexOf(ProfileName) != -1 ) {
+	    if ( line.indexOf(":") == line.length() -1 ) {
+		if ( line.indexOf("default") == -1 ) {
 		    // If we find the existing profile for this device, remove it
 		    foundProfile = 1;