diff -u plasma-widget-network-manager-0.0+svn930811/debian/changelog plasma-widget-network-manager-0.0+svn930811/debian/changelog --- plasma-widget-network-manager-0.0+svn930811/debian/changelog +++ plasma-widget-network-manager-0.0+svn930811/debian/changelog @@ -1,3 +1,10 @@ +plasma-widget-network-manager (0.0+svn930811-0ubuntu3~ppa2) jaunty; urgency=low + + * Add kubuntu_03_correctly_parse_peapver.diff to correctly parse the peapver + setting (was always set to 0) + + -- Per Hermansson Tue, 07 Apr 2009 00:01:36 +0200 + plasma-widget-network-manager (0.0+svn930811-0ubuntu3~ppa1) jaunty; urgency=low * Don't set peaplabel when not configured or when using peapver 0 diff -u plasma-widget-network-manager-0.0+svn930811/debian/patches/series plasma-widget-network-manager-0.0+svn930811/debian/patches/series --- plasma-widget-network-manager-0.0+svn930811/debian/patches/series +++ plasma-widget-network-manager-0.0+svn930811/debian/patches/series @@ -2,0 +3 @@ +kubuntu_03_correctly_parse_peapver.diff only in patch2: unchanged: --- plasma-widget-network-manager-0.0+svn930811.orig/debian/patches/kubuntu_03_correctly_parse_peapver.diff +++ plasma-widget-network-manager-0.0+svn930811/debian/patches/kubuntu_03_correctly_parse_peapver.diff @@ -0,0 +1,37 @@ +diff -u plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff +--- plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff 2009-03-23 17:39:31.707149656 +0100 ++++ plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff 2009-04-06 23:48:41.522570206 +0200 +@@ -1343,0 +1344,17 @@ ++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); ++ ++ } +--- plasma-widget-network-manager-0.0+svn930811.old/libs/storage/settings/802-1xpersistence.cpp 2009-02-24 11:54:16.000000000 +0100 ++++ plasma-widget-network-manager-0.0+svn930811/libs/storage/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); + + }