[PC-BSD Commits] r2677 - pcbsd/trunk/NetworkManager

[svn at pcbsd.org]

Author: kris
Date: 2008-09-02 10:54:11 -0700 (Tue, 02 Sep 2008)
New Revision: 2677

Modified:
   pcbsd/trunk/NetworkManager/NetworkManager.pro
   pcbsd/trunk/NetworkManager/networkman.cpp
Log:

Fixed how the network manager displays PPPoE 



Modified: pcbsd/trunk/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-09-02 17:53:09 UTC (rev 2676)
+++ pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-09-02 17:54:11 UTC (rev 2677)
@@ -21,4 +21,6 @@
 
 TRANSLATIONS = NetworkManager_en.ts
 
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+
 QT += qt3support

Modified: pcbsd/trunk/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.cpp	2008-09-02 17:53:09 UTC (rev 2676)
+++ pcbsd/trunk/NetworkManager/networkman.cpp	2008-09-02 17:54:11 UTC (rev 2677)
@@ -709,9 +709,13 @@
      
      // Check to see if PPPoE is enabled
      tmp = getValue( "/etc/rc.conf", "ppp_enable=", 1 );
+     if ( tmp != "YES" ) {
+       return; 
+     }
 
 
 
+
    	// Start loading the rc.conf information
    	tmp = getValue( "/etc/rc.conf", "ppp_mode=", 1 );
 	if ( tmp == "ddial" ) {
@@ -731,7 +735,7 @@
 
 	    // Check if we are on a profile line
 	    if ( line.find(":") == line.length() -1  ) {
-		if ( line.find(ProfileName) != -1 ) {
+		if ( line.find("default") == -1 ) {
 		    // If we find the existing profile for this device, remove it
 		    foundProfile = 1;