[PC-BSD Commits] r11957 - pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-08-08 06:27:28 -0700 (Mon, 08 Aug 2011)
New Revision: 11957

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
Log:
Fix the network tray to put the full SSID into the quick-connect function.


Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2011-08-08 12:55:55 UTC (rev 11956)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2011-08-08 13:27:28 UTC (rev 11957)
@@ -669,10 +669,18 @@
 }
 
 void NetworkTray::slotGetNetKey(QAction* act){
-  //Get the SSID from the action 
-  QString SSID = act->objectName();
+  //Get the small SSID from the action 
+  QString smSSID = act->objectName();
+  //trim the small ssid to remove any dots at the end
+  smSSID = smSSID.section(".",0,0,QString::SectionSkipEmpty);
+  
+  //get the full SSID string
+  QString dat = Utils::runShellCommandSearch("ifconfig -v "+DeviceName+" list scan",smSSID);
+  QStringList wdat = NetworkInterface::parseWifiScanLine(dat,true);
+  QString SSID = wdat[0];
+  
   //Get the Security Type
-  QString sectype = NetworkInterface::getWifiSecurity(SSID,DeviceName);
+  QString sectype = wdat[6];
   
   if(sectype == "None"){
     //run the Quick-Connect slot without a key