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

List:       kde-commits
Subject:    playground/base/plasma/applets/networkmanager/libs/storage
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2009-04-22 21:03:13
Message-ID: 1240434193.037887.16285.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 957781 by wstephens:

Commit patch by Per Hermansson to fix peapver restore.
BUG:188087


 M  +3 -3      settings/802-1xpersistence.cpp  
 M  +17 -0     settings_hand_edits.diff  


--- trunk/playground/base/plasma/applets/networkmanager/libs/storage/settings/802-1xpersistence.cpp \
#957780:957781 @@ -27,10 +27,10 @@
   setting->setCapath(m_config->readEntry("capath", ""));
   setting->setClientcert(m_config->readEntry("clientcert", QByteArray()));
   {
-    uint contents = m_config->readEntry("phase1peapver", 0);
-    if (contents == 0)
+    QString contents = m_config->readEntry("phase1peapver", "zero");
+    if (contents == "zero")
       setting->setPhase1peapver(Security8021xSetting::EnumPhase1peapver::zero);
-    else     if (contents == 1)
+    else     if (contents == "one")
       setting->setPhase1peapver(Security8021xSetting::EnumPhase1peapver::one);
 
   }
--- trunk/playground/base/plasma/applets/networkmanager/libs/storage/settings_hand_edits.diff \
#957780:957781 @@ -1324,3 +1324,20 @@
 Only in settings: vpnpersistence.h~
 Only in settings: wephash.cpp
 Only in settings: wephash.h
+diff -ur origsettings/802-1xpersistence.cpp settings/802-1xpersistence.cpp
+--- origsettings/802-1xpersistence.cpp	2009-02-24 11:54:16.000000000 +0100
++++ settings/802-1xpersistence.cpp	2009-04-06 23:36:45.294477869 +0200
+@@ -27,10 +27,10 @@
+   setting->setCapath(m_config->readEntry("capath", ""));
+   setting->setClientcert(m_config->readEntry("clientcert", QByteArray()));
+   {
+-    uint contents = m_config->readEntry("phase1peapver", 0);
+-    if (contents == 0)
++    QString contents = m_config->readEntry("phase1peapver", "zero");
++    if (contents == "zero")
+       setting->setPhase1peapver(Security8021xSetting::EnumPhase1peapver::zero);
+-    else     if (contents == 1)
++    else     if (contents == "one")
+       setting->setPhase1peapver(Security8021xSetting::EnumPhase1peapver::one);
+ 
+   }


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