[PC-BSD Commits] r17261 - in pcbsd/current/src-qt4/pc-netmanager/src: NetworkTray ethernetconfig wificonfig

[svn at pcbsd.org]

Author: kris
Date: 2012-06-12 17:13:01 +0000 (Tue, 12 Jun 2012)
New Revision: 17261

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
Log:

Switch all networking GUI's over to using Utils::restartNetworking(), much
more reliable now



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2012-06-12 17:03:51 UTC (rev 17260)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2012-06-12 17:13:01 UTC (rev 17261)
@@ -473,8 +473,8 @@
 
 // If the user wants to restart the network, do so
 void NetworkTray::slotRestartNetwork() {
-  trayIcon->showMessage( tr("Please Wait"),tr("Restarting Network"),QSystemTrayIcon::NoIcon,5000);  
-  NetworkInterface::restart();
+  //trayIcon->showMessage( tr("Please Wait"),tr("Restarting Network"),QSystemTrayIcon::NoIcon,5000);  
+  Utils::restartNetworking();
 }
 
 void NetworkTray::openNetManager() {

Modified: pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp	2012-06-12 17:03:51 UTC (rev 17260)
+++ pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.cpp	2012-06-12 17:13:01 UTC (rev 17261)
@@ -217,7 +217,7 @@
         Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", "ifconfig_" + DeviceName + "=\"" + ifConfigLine + "\"", -1); 
    }
 
-   system("(sync; route -n flush; /etc/rc.d/netif restart; /etc/rc.d/routing restart) &");
+   Utils::restartNetworking();
 
    // Done, now set the apply button to off
    buttonApply->setEnabled(FALSE);

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2012-06-12 17:03:51 UTC (rev 17260)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2012-06-12 17:13:01 UTC (rev 17261)
@@ -271,7 +271,7 @@
     }
 
     if ( ! WPAONLY )
-      NetworkInterface::restart(); 
+      Utils::restartNetworking();
 
     system("chmod 600 /etc/wpa_supplicant.conf");