[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/applets/networkmanager/libs/ui
From:       Helmut Schaa <hschaa () suse ! de>
Date:       2009-01-26 18:04:08
Message-ID: 1232993048.157199.19258.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 917025 by hschaa:

Update wireless-security property if the secuirty mode gets changed


 M  +5 -0      security/802_11_wireless_security_widget.cpp  
 M  +0 -11     wirelesspreferences.cpp  


--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/security/802_11_wireless_security_widget.cpp \
#917024:917025 @@ -25,6 +25,7 @@
 #include <KDebug>
 
 #include "connection.h"
+#include "settings/802-11-wireless.h"
 #include "settings/802-11-wireless-security.h"
 #include "ui_802_11_wireless_security.h"
 #include "securitywidget.h"
@@ -44,6 +45,7 @@
     int wpaEapIndex;
     int security;
     WpaEapWidget * wpaeapwid;
+    Knm::WirelessSetting * wsetting;
     Knm::WirelessSecuritySetting * setting;
 };
 
@@ -57,6 +59,7 @@
     d->wpaPskIndex = -1;
     d->ui.setupUi(this);
 
+    d->wsetting = static_cast<Knm::WirelessSetting \
                *>(connection->setting(Knm::Setting::Wireless));
     d->setting = static_cast<Knm::WirelessSecuritySetting \
*>(connection->setting(Knm::Setting::WirelessSecurity));  
     // cache ap and device capabilities here
@@ -142,8 +145,10 @@
 
 void Wireless80211SecurityWidget::writeConfig()
 {
+    d->wsetting->setSecurity(d->setting->name());
     if (d->ui.cmbType->currentIndex() == d->noSecurityIndex) {
         d->setting->setSecurityType(Knm::WirelessSecuritySetting::EnumSecurityType::None);
 +        d->wsetting->setSecurity("");
     }
     if (d->ui.cmbType->currentIndex() == d->staticWepHexIndex) {
         d->setting->setSecurityType(Knm::WirelessSecuritySetting::EnumSecurityType::WEP40); \
                // FIXME
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/wirelesspreferences.cpp \
#917024:917025 @@ -88,16 +88,5 @@
 void WirelessPreferences::save()
 {
     ConnectionPreferences::save();
-    // if wireless security is enabled, set it also in the wirelesssetting
-    Knm::WirelessSecuritySetting * security =
-        static_cast<Knm::WirelessSecuritySetting*>(m_connection->setting(Knm::Setting::WirelessSecurity));
                
-    Knm::WirelessSetting * wireless =
-        static_cast<Knm::WirelessSetting*>(m_connection->setting(Knm::Setting::Wireless));
                
-
-    if (security->securityType() == \
                Knm::WirelessSecuritySetting::EnumSecurityType::None) {
-        wireless->setSecurity(QString());
-    } else {
-        wireless->setSecurity(security->name());
-    }
 }
 // vim: sw=4 sts=4 et tw=100


[prev in list] [next in list] [prev in thread] [next in thread]