[kde-plasma-networkmanagement] Really fix #bz832893

[Jan Grulich]

commit 4e76a933973e23997515d0b5c9e7667e51d1dc16
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Mon Feb 25 16:07:18 2013 +0100

    Really fix #bz832893

 kde-plasma-networkmanagement-wpa2.patch |   51 +++++++++++++++++++++++++++++++
 kde-plasma-networkmanagement.spec       |    7 +++-
 2 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/kde-plasma-networkmanagement-wpa2.patch b/kde-plasma-networkmanagement-wpa2.patch
index 3437181..5514e25 100644
--- a/kde-plasma-networkmanagement-wpa2.patch
+++ b/kde-plasma-networkmanagement-wpa2.patch
@@ -219,3 +219,54 @@
      bool hasPersistentSecrets() const;
  
      /**
+--- a/libs/service/secretstorage.cpp
++++ b/libs/service/secretstorage.cpp
+@@ -20,8 +20,6 @@
+ */
+ 
+ #include "secretstorage.h"
+-#include "../internals/settings/802-11-wireless-security.h"
+-#include "../internals/settings/802-1x.h"
+ 
+ #include <KConfigGroup>
+ #include <kwallet.h>
+@@ -166,19 +164,6 @@
+                 while (i.hasNext()) {
+                     if (i.next().key() != con->uuid())
+                         continue;
+-
+-                    Knm::WirelessSecuritySetting * settingSecurity = static_cast<Knm::WirelessSecuritySetting *>(con->setting(Knm::Setting::WirelessSecurity));
+-                    if (settingSecurity) {
+-                        Knm::Security8021xSetting * setting8021x = static_cast<Knm::Security8021xSetting *>(con->setting(Knm::Setting::Security8021x));
+-
+-                        if (setting8021x) {
+-                            if (settingSecurity->securityType() == Knm::WirelessSecuritySetting::EnumSecurityType::DynamicWep ||
+-                                settingSecurity->securityType() == Knm::WirelessSecuritySetting::EnumSecurityType::WpaEap) {
+-                                kDebug() << "Enabling workaround for DynamicWep and WpaEap";
+-                                setting8021x->setEnabled(true); // needed for needSecrets() below, otherwise needSecrets() returns an empty list.
+-                            }
+-                        }
+-                    }
+ 
+                     QPair<QString,GetSecretsFlags> pair = i.value();
+                     bool settingsFound = false;
+--- a/libs/service/secretstorage.cpp
++++ b/libs/service/secretstorage.cpp
+@@ -178,7 +178,7 @@
+                             if (wallet->readMap(walletKeyFor(con->uuid(), setting), map) == 0) {
+                                 setting->secretsFromMap(map);
+                             }
+-                            QStringList needSecretsList = setting->needSecrets();
++                            QStringList needSecretsList = setting->needSecrets(pair.second & RequestNew);
+                             kDebug() << "Needed secrets" << needSecretsList;
+                             if ((pair.second & RequestNew) || (!needSecretsList.isEmpty() && (pair.second & AllowInteraction))) {
+                                 askUser(con, pair.first, needSecretsList);
+@@ -278,7 +278,7 @@
+         QMap<QString,QString> map = config.entryMap();
+         Knm::Setting *setting = con->setting(Knm::Setting::typeFromString(name));
+         setting->secretsFromMap(map);
+-        QStringList needSecretsList = setting->needSecrets();
++        QStringList needSecretsList = setting->needSecrets(flags & RequestNew);
+         if ((flags & RequestNew) || (!needSecretsList.isEmpty() && (flags & AllowInteraction))) {
+             askUser(con, name, needSecretsList);
+         } else {
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index b07a93f..4c3e730 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,7 +1,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9.0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
@@ -214,7 +214,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
-* Sat Jan 27 2013 Jan Grulich <jgrulich at redhat.com> 0.9.0.7-2
+* Mon Feb 25 2013 Jan Grulich <jgrulich at redhat.com> 0.9.0.7-3
+- really fix #bz832893
+
+* Tue Feb 19 2013 Jan Grulich <jgrulich at redhat.com> 0.9.0.7-2
 - fix the wpa2 bug with missing password field #bz832893
 - fix the bug with lock indicator #bz912603