Changeset 2676

Timestamp:

09/02/08 10:53:09 (3 months ago)

Author:

kris

Message:

Fixed a bug with PPPoE not being able to save properly

Location:

pcbsd/trunk/NetworkManagerAdmin

Files:

• NetworkManagerAdmin.pro (modified) (1 diff)
• netmanadmin.cpp (modified) (4 diffs)

pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro

@@ -22 +22 @@
 TRANSLATIONS = NetworkManagerAdmin_en.ts
 
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

pcbsd/trunk/NetworkManagerAdmin/netmanadmin.cpp

@@ -37 +37 @@
     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
@@ -473 +476 @@
     
     
-     QFile filein( "/etc/ppp/ppp.conf" );
      int foundProfile = 0;
      QString ProfileName = "internet";
@@ -497 +499 @@
 
         // Now load the ppp.conf file
+        QString PPPFile = "/etc/ppp/ppp.conf";
+        QFile filein( PPPFile );
         if ( filein.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &filein );
@@ -503 +507 @@
             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;