Hello community, here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory checked in at Thu May 7 12:15:06 CEST 2009. -------- --- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-04-22 12:19:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-04-23 12:52:15.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 23 12:51:00 CEST 2009 - wstephenson@suse.de + +- update to r958040 + * Fix for WPA-EAP connection deserialization + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-kde4.spec ++++++ --- /var/tmp/diff_new_pack.H19901/_old 2009-05-07 12:14:54.000000000 +0200 +++ /var/tmp/diff_new_pack.H19901/_new 2009-05-07 12:14:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NetworkManager-kde4 (Version 0.7.svn957516) +# spec file for package NetworkManager-kde4 (Version 0.7.svn958040) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: NetworkManager-kde4 BuildRequires: NetworkManager-devel kdebase4-workspace-devel -Version: 0.7.svn957516 +Version: 0.7.svn958040 Release: 1 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -146,6 +146,9 @@ %{_datadir}/kde4/services/networkmanagement_vpncui.desktop %changelog +* Thu Apr 23 2009 wstephenson@suse.de +- update to r958040 + * Fix for WPA-EAP connection deserialization * Wed Apr 22 2009 wstephenson@suse.de - update to r957516 * Fri Feb 13 2009 coolo@suse.de ++++++ networkmanager.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/storage/settings/802-1xpersistence.cpp new/networkmanager/libs/storage/settings/802-1xpersistence.cpp --- old/networkmanager/libs/storage/settings/802-1xpersistence.cpp 2009-01-26 17:05:08.000000000 +0100 +++ new/networkmanager/libs/storage/settings/802-1xpersistence.cpp 2009-04-22 23:03:08.000000000 +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); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/storage/settings_hand_edits.diff new/networkmanager/libs/storage/settings_hand_edits.diff --- old/networkmanager/libs/storage/settings_hand_edits.diff 2009-02-01 22:49:21.000000000 +0100 +++ new/networkmanager/libs/storage/settings_hand_edits.diff 2009-04-22 23:03:08.000000000 +0200 @@ -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); + + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/ui/ipv4widget.cpp new/networkmanager/libs/ui/ipv4widget.cpp --- old/networkmanager/libs/ui/ipv4widget.cpp 2009-01-26 09:31:28.000000000 +0100 +++ new/networkmanager/libs/ui/ipv4widget.cpp 2009-04-23 10:42:56.000000000 +0200 @@ -30,6 +30,7 @@ class IpV4Widget::Private { public: + enum MethodIndex { AutomaticMethodIndex = 0, LinkLocalMethodIndex, ManualMethodIndex, SharedMethodIndex }; Ui_SettingsIp4Config ui; Knm::Ipv4Setting * setting; }; @@ -41,6 +42,8 @@ d->setting = static_castKnm::Ipv4Setting*(connection->setting(Knm::Setting::Ipv4)); connect(d->ui.btnAddAddress, SIGNAL(clicked()), this, SLOT(addIpClicked())); connect(d->ui.btnRemoveAddress, SIGNAL(clicked()), this, SLOT(removeIpClicked())); + connect(d->ui.method, SIGNAL(currentIndexChanged(int)), this, SLOT(methodChanged(int))); + methodChanged(d->AutomaticMethodIndex); } IpV4Widget::~IpV4Widget() @@ -53,16 +56,16 @@ kDebug(); switch (d->setting->method()) { case Knm::Ipv4Setting::EnumMethod::Automatic: - d->ui.method->setCurrentIndex(0); + d->ui.method->setCurrentIndex(d->AutomaticMethodIndex); break; case Knm::Ipv4Setting::EnumMethod::LinkLocal: - d->ui.method->setCurrentIndex(1); + d->ui.method->setCurrentIndex(d->LinkLocalMethodIndex); break; case Knm::Ipv4Setting::EnumMethod::Manual: - d->ui.method->setCurrentIndex(2); + d->ui.method->setCurrentIndex(d->ManualMethodIndex); break; case Knm::Ipv4Setting::EnumMethod::Shared: - d->ui.method->setCurrentIndex(3); + d->ui.method->setCurrentIndex(d->SharedMethodIndex); break; default: kDebug() << "Unrecognised value for method:" << d->setting->method(); @@ -140,6 +143,39 @@ d->setting->setDnssearch(d->ui.dnsSearch->text().split(',')); } +void IpV4Widget::methodChanged(int currentIndex) +{ + kDebug() << currentIndex; + if (currentIndex == d->AutomaticMethodIndex) { + d->ui.addresses->setEnabled(false); + d->ui.dns->setEnabled(false); + d->ui.dnsSearch->setEnabled(false); + d->ui.btnAddAddress->setEnabled(false); + d->ui.btnRemoveAddress->setEnabled(false); + } + else if (currentIndex == d->LinkLocalMethodIndex) { + d->ui.addresses->setEnabled(false); + d->ui.dns->setEnabled(false); + d->ui.dnsSearch->setEnabled(false); + d->ui.btnAddAddress->setEnabled(false); + d->ui.btnRemoveAddress->setEnabled(false); + } + else if (currentIndex == d->ManualMethodIndex) { + d->ui.addresses->setEnabled(true); + d->ui.dns->setEnabled(true); + d->ui.dnsSearch->setEnabled(true); + d->ui.btnAddAddress->setEnabled(true); + d->ui.btnRemoveAddress->setEnabled(true); + } + else if (currentIndex == d->SharedMethodIndex) { + d->ui.addresses->setEnabled(false); + d->ui.dns->setEnabled(true); + d->ui.dnsSearch->setEnabled(true); + d->ui.btnAddAddress->setEnabled(false); + d->ui.btnRemoveAddress->setEnabled(false); + } +} + void IpV4Widget::addIpClicked() { QTreeWidgetItem * item = new QTreeWidgetItem(d->ui.addresses); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/ui/ipv4widget.h new/networkmanager/libs/ui/ipv4widget.h --- old/networkmanager/libs/ui/ipv4widget.h 2009-01-26 09:31:28.000000000 +0100 +++ new/networkmanager/libs/ui/ipv4widget.h 2009-04-23 10:42:56.000000000 +0200 @@ -39,6 +39,10 @@ void readConfig(); void writeConfig(); protected Q_SLOTS: + /** + * Update state of widgets dependent on IP setting method + */ + void methodChanged(int); void addIpClicked(); void removeIpClicked(); private: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org