Hello community,
here is the log from the commit of package NetworkManager-kde
checked in at Thu Sep 25 23:41:02 CEST 2008.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-08-18 12:51:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes 2008-09-25 18:39:03.632655000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 25 14:15:01 CEST 2008 - hschaa@suse.de
+
+- Fix build
+- Fix connection issues introduced by NM API changes
+
+-------------------------------------------------------------------
Old:
----
nm_vpn_routes.patch
revert_nm_vpn_api1.patch
revert_nm_vpn_api2.patch
New:
----
fix_uuid.patch
fix_vpn_api.patch
fix_vpnc_openvpn.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.oJ2751/_old 2008-09-25 23:40:33.000000000 +0200
+++ /var/tmp/diff_new_pack.oJ2751/_new 2008-09-25 23:40:33.000000000 +0200
@@ -28,18 +28,18 @@
Group: System/GUI/KDE
AutoReqProv: on
Version: 0.7r848570
-Release: 1
+Release: 18
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: NetworkManager >= 0.7
Provides: NetworkManager-client
Source0: %{appname}-%{version}.tar.bz2
Source1: knetworkmanager.default.sh
-Patch0: revert_nm_vpn_api2.patch
-Patch1: revert_nm_vpn_api1.patch
-Patch2: nm_vpn_routes.patch
Patch3: fix_build.patch
Patch4: fix_lang.patch
+Patch5: fix_vpn_api.patch
+Patch6: fix_vpnc_openvpn.patch
+Patch7: fix_uuid.patch
%description
KNetworkManager is a system tray applet for controlling network
@@ -108,11 +108,14 @@
%prep
%setup -n %{appname}-%{version} -q
-%patch0 -R -p0
-%patch1 -R -p0
-%patch2 -p0
+#%patch0 -R -p0
+#%patch1 -R -p0
+#%patch2 -p0
%patch3 -p0
%patch4 -R -p0
+%patch5 -p2
+%patch6 -p2
+%patch7 -p0
%build
. /etc/opt/kde3/common_options
@@ -176,6 +179,9 @@
/opt/kde3/share/services/%{appname}_vpnc.desktop
%changelog
+* Thu Sep 25 2008 hschaa@suse.de
+- Fix build
+- Fix connection issues introduced by NM API changes
* Mon Aug 18 2008 hschaa@suse.de
- Update to r848570
* Fix build issues introduced due to NetworkManager API changes
++++++ fix_uuid.patch ++++++
Index: knetworkmanager/src/knetworkmanager-connection.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection.h (Revision 835773)
+++ knetworkmanager/src/knetworkmanager-connection.h (Arbeitskopie)
@@ -58,8 +58,8 @@
Connection();
virtual ~Connection();
- QString getID() const;
- void setID(const QString& id);
+ virtual QString getID() const = 0;
+ virtual void setID(const QString& id) = 0;
// get a specific setting
ConnectionSetting* getSetting(const QString&) const;
Index: knetworkmanager/src/knetworkmanager-generic_connection.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-generic_connection.cpp (Revision 835773)
+++ knetworkmanager/src/knetworkmanager-generic_connection.cpp (Arbeitskopie)
@@ -71,6 +71,18 @@
return QString::null;
}
+QString
+GenericConnection::getID() const
+{
+ return getInfoSetting()->getUUID();
+}
+
+void
+GenericConnection::setID(const QString& id)
+{
+ getInfoSetting()->setUUID(id);
+}
+
Info* GenericConnection::getInfoSetting() const
{
return dynamic_cast(getSetting("connection"));
Index: knetworkmanager/src/knetworkmanager-connection.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection.cpp (Revision 835773)
+++ knetworkmanager/src/knetworkmanager-connection.cpp (Arbeitskopie)
@@ -56,7 +56,6 @@
{
public:
ConnectionPrivate(Connection* parent)
- : id("")
{
conn_dbus = new ConnectionDBus(parent);
conn_secrets_dbus = new ConnectionSecretsDBus(parent);
@@ -66,7 +65,6 @@
QDBusObjectPath obj_path;
ConnectionDBus* conn_dbus;
ConnectionSecretsDBus* conn_secrets_dbus;
- QString id;
QValueList settings;
QString specific_object;
};
@@ -102,18 +100,6 @@
delete d;
}
-QString
-Connection::getID() const
-{
- return d->id;
-}
-
-void
-Connection::setID(const QString& id)
-{
- d->id = id;
-}
-
ConnectionSetting*
Connection::getSetting(const QString& type) const
{
Index: knetworkmanager/src/knetworkmanager-generic_connection.h
===================================================================
--- knetworkmanager/src/knetworkmanager-generic_connection.h (Revision 835773)
+++ knetworkmanager/src/knetworkmanager-generic_connection.h (Arbeitskopie)
@@ -48,6 +48,9 @@
GenericConnection(const QString&);
QString getType();
+ QString getID() const;
+ void setID(const QString& id);
+
Info* getInfoSetting() const;
};
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_info.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_info.h (Revision 864752)
+++ knetworkmanager/src/knetworkmanager-connection_setting_info.h (Revision 864753)
@@ -62,13 +62,17 @@
QDateTime getTimestamp() const;
void setTimestamp(const QDateTime&);
+ QString getUUID() const;
+ void setUUID(const QString&);
+
bool isValid() const;
- private:
+ private:
QString _name;
QString _devtype;
bool _autoconnect;
QDateTime _timestamp;
+ QString _uuid;
};
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_info.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_info.cpp (Revision 864752)
+++ knetworkmanager/src/knetworkmanager-connection_setting_info.cpp (Revision 864753)
@@ -104,14 +104,26 @@
_timestamp = dt;
}
+QString
+Info::getUUID() const
+{
+ return _uuid;
+}
+
+void
+Info::setUUID(const QString& uuid)
+{
+ _uuid = uuid;
+}
+
SettingsMap
Info::toMap() const
{
SettingsMap map;
map.insert(NM_SETTING_CONNECTION_ID, QDBusData::fromString(_name));
map.insert(NM_SETTING_CONNECTION_TYPE, QDBusData::fromString(_devtype));
-
map.insert(NM_SETTING_CONNECTION_AUTOCONNECT, QDBusData::fromBool(_autoconnect));
+ map.insert(NM_SETTING_CONNECTION_UUID, QDBusData::fromString(_uuid));
if (!_timestamp.isNull())
map.insert(NM_SETTING_CONNECTION_TIMESTAMP, QDBusData::fromUInt32(_timestamp.toTime_t()));
@@ -135,6 +147,9 @@
if ((it = map.find(NM_SETTING_CONNECTION_TIMESTAMP)) != map.end())
_timestamp.setTime_t(it.data().toUInt32());
+
+ if ((it = map.find(NM_SETTING_CONNECTION_UUID)) != map.end())
+ _uuid = it.data().toString();
}
bool
++++++ fix_vpn_api.patch ++++++
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp BUILD2/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-09-17 12:00:49.000000000 +0200
@@ -120,7 +120,6 @@
{
list.append(QDBusData::fromString(*it));
}
- map.insert(NM_SETTING_VPN_ROUTES, QDBusData::fromQValueList(list));
}
// NM expects a String/String map -> convert
@@ -148,16 +147,6 @@
if ((it = map.find(NM_SETTING_VPN_USER_NAME)) != map.end())
_userName = it.data().toString();
- if ((it = map.find(NM_SETTING_VPN_ROUTES)) != map.end())
- {
- QValueList<QDBusData> list = it.data().toQValueList();
- _routes.clear();
- for (QValueList<QDBusData>::Iterator it2 = list.begin(); it2 != list.end(); ++it2)
- {
- _routes.append((*it2).toString());
- }
- }
-
QDBusDataMap<QString> data;
_data.clear();
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp BUILD2/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp 2008-09-17 15:29:27.000000000 +0200
@@ -48,7 +48,7 @@
QMap VPNConfigWidget::getVPNProperties()
{
- return QMap();
+ return QMap();
}
QStringList VPNConfigWidget::getVPNRoutes()
@@ -82,9 +82,9 @@
}
-QMap VPNAuthenticationWidget::getPasswords()
+QMap VPNAuthenticationWidget::getPasswords()
{
- return QMap();
+ return QMap();
}
void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
++++++ fix_vpnc_openvpn.patch ++++++
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/AUTHORS BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/AUTHORS
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/AUTHORS 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/AUTHORS 2008-09-25 13:58:30.000000000 +0200
@@ -1 +1,2 @@
Helmut Schaa ,
+Thomas Kallenberg
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp 2008-09-25 13:58:30.000000000 +0200
@@ -190,30 +190,29 @@
}
-void OpenVPNConfig::setVPNData(const QStringList& routes, const QMap& properties)
+void OpenVPNConfig::setVPNData(const QStringList& routes, const QMap& properties)
{
-
// fill up our inputfields
- for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
+ for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
{
QString entry = it.key();
- QDBusData value = it.data();
+ QString value = it.data();
if (entry == "connection-type")
{
- OpenVPNConnectionType::CONNECTIONTYPE type = OpenVPNConnectionType::mapString2ConnectionType(value.toInt32());
+ OpenVPNConnectionType::CONNECTIONTYPE type = OpenVPNConnectionType::mapString2ConnectionType(value.toInt());
_openvpnWidget->cboConnectionType->setCurrentItem(type);
_openvpnWidget->widgetStack->raiseWidget(type);
}
else if (entry == "remote")
{
- _openvpnWidget->gateway->setText(value.toString());
+ _openvpnWidget->gateway->setText(value);
}
else if (entry == "port")
{
- if (value.toInt32() > 0)
+ if (value.toInt() > 0)
{
- _openvpnWidget->port->setText(QString::number(value.toInt32()));
+ _openvpnWidget->port->setText(value);
_openvpnWidget->chkDefaultPort->setChecked(false);
}
else
@@ -223,55 +222,56 @@
}
else if (entry == "proto" || entry == "proto-tcp")
{
- _openvpnWidget->chkUseTCP->setChecked( value.toBool() );
+ _openvpnWidget->chkUseTCP->setChecked( value == "yes");
}
else if (entry == "ca")
{
- _openvpnWidget->editCA->setURL(value.toString());
+ _openvpnWidget->editCA->setURL(value);
}
else if (entry == "cert")
{
- _openvpnWidget->editCert->setURL(value.toString());
+ _openvpnWidget->editCert->setURL(value);
}
else if (entry == "key")
{
- _openvpnWidget->editKey->setURL(value.toString());
+ _openvpnWidget->editKey->setURL(value);
}
else if (entry == "cipher")
{
_openvpnWidget->chkUseCipher->setChecked(true);
- _openvpnWidget->cboCipher->setCurrentItem(value.toString());
+ _openvpnWidget->cboCipher->setCurrentItem(value);
}
else if (entry == "comp-lzo")
{
- _openvpnWidget->chkUseLZO->setChecked(value.toBool());
+ _openvpnWidget->chkUseLZO->setChecked(value == "true");
}
else if (entry == "shared-key" || entry == "static-key")
{
- _openvpnWidget->editSharedKey->setURL(value.toString());
+ _openvpnWidget->editSharedKey->setURL(value);
}
else if (entry == "username")
{
- _openvpnWidget->editUsername->setText(value.toString());
+ _openvpnWidget->editUsername->setText(value);
}
else if (entry == "local-ip")
{
- _openvpnWidget->editLocalIP->setText(value.toString());
+ _openvpnWidget->editLocalIP->setText(value);
}
else if (entry == "remote-ip")
{
- _openvpnWidget->editRemoteIP->setText(value.toString());
+ _openvpnWidget->editRemoteIP->setText(value);
+ }
+ else if (entry == "dev" || entry == "tap-dev") {
+ _openvpnWidget->chkUseTAP->setChecked(value == "true");
}
- else if (entry == "dev" || entry == "tap-dev")
- _openvpnWidget->chkUseTAP->setChecked( value.toBool() );
else if (entry == "ta")
{
_openvpnWidget->chkUseTLS->setChecked(true);
- _openvpnWidget->editTLSAuth->setURL( value.toString() );
+ _openvpnWidget->editTLSAuth->setURL(value);
}
else if (entry == "ta-dir")
{
- _openvpnWidget->cboDirection->setCurrentItem( value.toString() );
+ _openvpnWidget->cboDirection->setCurrentItem(value);
}
else
{
@@ -287,41 +287,47 @@
}
}
-QMapOpenVPNConfig::getVPNProperties()
+QMapOpenVPNConfig::getVPNProperties()
{
// build a StingList of properties
- QMap strlist;
-
- // TODO sync properties with NM trunk
+ QMap strlist;
- strlist.insert("connection-type", QDBusData::fromInt32(OpenVPNConnectionType::mapConnectionType2String((OpenVPNConnectionType::CONNECTIONTYPE)_openvpnWidget->cboConnectionType->currentItem())));
- strlist.insert("remote", QDBusData::fromString(_openvpnWidget->gateway->text()));
+ strlist.insert("connection-type", QString::number(OpenVPNConnectionType::mapConnectionType2String((OpenVPNConnectionType::CONNECTIONTYPE)_openvpnWidget->cboConnectionType->currentItem())));
+ strlist.insert("remote", QString(_openvpnWidget->gateway->text()));
// port is not necessary
if (!_openvpnWidget->port->text().isEmpty() && !_openvpnWidget->chkDefaultPort->isChecked())
- strlist.insert("port", QDBusData::fromInt32(_openvpnWidget->port->text().toInt()));
+ strlist.insert("port", _openvpnWidget->port->text());
- strlist.insert("ca", QDBusData::fromString(_openvpnWidget->editCA->url()));
- strlist.insert("cert",QDBusData::fromString(_openvpnWidget->editCert->url() ));
- strlist.insert("key", QDBusData::fromString(_openvpnWidget->editKey->url()));
+ strlist.insert("ca", QString(_openvpnWidget->editCA->url()));
+ strlist.insert("cert",QString(_openvpnWidget->editCert->url() ));
+ strlist.insert("key", QString(_openvpnWidget->editKey->url()));
if (_openvpnWidget->chkUseCipher->isChecked())
- strlist.insert("cipher", QDBusData::fromString(_openvpnWidget->cboCipher->currentText()));
+ strlist.insert("cipher", QString(_openvpnWidget->cboCipher->currentText()));
if (_openvpnWidget->chkUseLZO->isChecked())
- strlist.insert("comp-lzo", QDBusData::fromBool(true));
+ strlist.insert("comp-lzo", QString("true"));
+ else
+ strlist.insert("comp-lzo", QString("false"));
- strlist.insert("static-key", QDBusData::fromString(_openvpnWidget->editSharedKey->url()));
- strlist.insert("username", QDBusData::fromString(_openvpnWidget->editUsername->text()));
- strlist.insert("local-ip", QDBusData::fromString(_openvpnWidget->editLocalIP->text()));
- strlist.insert("remote-ip", QDBusData::fromString(_openvpnWidget->editRemoteIP->text()));
- strlist.insert("tap-dev", QDBusData::fromBool(_openvpnWidget->chkUseTAP->isChecked()));
- strlist.insert("proto-tcp", QDBusData::fromBool(_openvpnWidget->chkUseTCP->isChecked()));
+ strlist.insert("static-key", QString(_openvpnWidget->editSharedKey->url()));
+ strlist.insert("username", QString(_openvpnWidget->editUsername->text()));
+ strlist.insert("local-ip", QString(_openvpnWidget->editLocalIP->text()));
+ strlist.insert("remote-ip", QString(_openvpnWidget->editRemoteIP->text()));
+
+ if (_openvpnWidget->chkUseTAP->isChecked()) {
+ strlist.insert("tap-dev", "true");
+ strlist.insert("proto-tcp", "true");
+ } else {
+ strlist.insert("tap-dev", "false");
+ strlist.insert("proto-tcp", "false");
+ }
if (_openvpnWidget->chkUseTLS->isChecked())
- strlist.insert("ta", QDBusData::fromString(_openvpnWidget->editTLSAuth->url()));
+ strlist.insert("ta", QString(_openvpnWidget->editTLSAuth->url()));
- strlist.insert("ta-dir", QDBusData::fromString(_openvpnWidget->cboDirection->currentText()));
+ strlist.insert("ta-dir", QString(_openvpnWidget->cboDirection->currentText()));
return strlist;
}
@@ -520,26 +526,26 @@
}
-void OpenVPNAuthentication::setVPNData(const QStringList& /*routes*/, const QMap& properties)
+void OpenVPNAuthentication::setVPNData(const QStringList& /*routes*/, const QMap& properties)
{
// find the connection type property
- for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
+ for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
{
if (it.key() == "connection-type")
{
- _connectionType = OpenVPNConnectionType::mapString2ConnectionType(it.data().toInt32());
+ _connectionType = OpenVPNConnectionType::mapString2ConnectionType(it.data().toInt());
break;
}
}
}
-QMap OpenVPNAuthentication::getPasswords()
+QMap OpenVPNAuthentication::getPasswords()
{
- QMap pwds;
+ QMap pwds;
if ((_connectionType == OpenVPNConnectionType::PASSWORD) || (_connectionType == OpenVPNConnectionType::X509USERPASS))
- pwds.insert("password", QDBusData::fromString(_openvpnAuth->editUserPassword->password()));
+ pwds.insert("password", QString(_openvpnAuth->editUserPassword->password()));
else
- pwds.insert("no-secret", QDBusData::fromString("true"));
+ pwds.insert("no-secret", QString("true"));
return pwds;
}
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h 2008-09-25 13:58:30.000000000 +0200
@@ -66,8 +66,8 @@
{
Q_OBJECT
public:
- void setVPNData(const QStringList& routes, const QMap& properties);
- QMap getVPNProperties();
+ void setVPNData(const QStringList& routes, const QMap& properties);
+ QMap getVPNProperties();
QStringList getVPNRoutes();
bool hasChanged();
bool isValid(QStringList& );
@@ -94,8 +94,8 @@
public:
OpenVPNAuthentication(QWidget* parent = NULL, char* name = NULL);
~OpenVPNAuthentication();
- void setVPNData(const QStringList&, const QMap&);
- QMap getPasswords();
+ void setVPNData(const QStringList&, const QMap&);
+ QMap getPasswords();
bool needsUserInteraction();
private:
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/AUTHORS BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/AUTHORS
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/AUTHORS 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/AUTHORS 2008-09-25 13:58:30.000000000 +0200
@@ -1 +1,2 @@
Helmut Schaa ,
+Thomas Kallenberg
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp 2008-09-25 13:58:30.000000000 +0200
@@ -95,44 +95,44 @@
}
-void VPNCConfig::setVPNData(const QStringList& routes, const QMap& properties)
+void VPNCConfig::setVPNData(const QStringList& routes, const QMap& properties)
{
// fill up our inputfields (only textfields atm)
- for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
+ for(QMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
{
QString entry = it.key();
- QDBusData value = it.data();
+ QString value = it.data();
if (entry == "IPSec gateway")
{
- _vpncWidget->IPSec_gateway->setText(value.toString());
+ _vpncWidget->IPSec_gateway->setText(value);
}
else if (entry == "IPSec ID")
{
- _vpncWidget->IPSec_ID->setText(value.toString());
+ _vpncWidget->IPSec_ID->setText(value);
}
else if (entry == "Xauth username")
{
- _vpncWidget->Xauth_username->setText(value.toString());
+ _vpncWidget->Xauth_username->setText(value);
_vpncWidget->chkOverrideUsername->setChecked(true);
}
else if (entry == "Domain")
{
- _vpncWidget->Domain->setText(value.toString());
+ _vpncWidget->Domain->setText(value);
_vpncWidget->chkUseDomain->setChecked(true);
}
else if (entry == "NAT-Keepalive packet interval")
{
- _vpncWidget->nat_keep_alive_interval->setText(value.toString());
+ _vpncWidget->nat_keep_alive_interval->setText(value);
_vpncWidget->chkUseKeepAlive->setChecked(true);
}
else if (entry == "Disable NAT Traversal")
{
- _vpncWidget->chkDisableNatTraversal->setChecked(value.toBool());
+ _vpncWidget->chkDisableNatTraversal->setChecked(value == "true");
}
else if (entry == "Enable Single DES")
{
- _vpncWidget->chkSingleDES->setChecked(value.toBool());
+ _vpncWidget->chkSingleDES->setChecked(value == "true");
}
}
@@ -144,24 +144,24 @@
}
}
-QMap VPNCConfig::getVPNProperties()
+QMap VPNCConfig::getVPNProperties()
{
// build a StingList of properties
- QMap strlist;
- strlist.insert("IPSec gateway", QDBusData::fromString(_vpncWidget->IPSec_gateway->text()));
- strlist.insert("IPSec ID", QDBusData::fromString(_vpncWidget->IPSec_ID->text()));
+ QMap strlist;
+ strlist.insert("IPSec gateway", QString(_vpncWidget->IPSec_gateway->text()));
+ strlist.insert("IPSec ID", QString(_vpncWidget->IPSec_ID->text()));
if (_vpncWidget->chkOverrideUsername->isChecked())
- strlist.insert("Xauth username", QDBusData::fromString(_vpncWidget->Xauth_username->text()));
+ strlist.insert("Xauth username", QString(_vpncWidget->Xauth_username->text()));
if (_vpncWidget->chkUseDomain->isChecked())
- strlist.insert("Domain", QDBusData::fromString(_vpncWidget->Domain->text()));
+ strlist.insert("Domain", QString(_vpncWidget->Domain->text()));
if (_vpncWidget->chkUseKeepAlive->isChecked())
- strlist.insert("NAT-Keepalive packet interval", QDBusData::fromString(_vpncWidget->nat_keep_alive_interval->text()));
+ strlist.insert("NAT-Keepalive packet interval", QString(_vpncWidget->nat_keep_alive_interval->text()));
- strlist.insert("Disable NAT Traversal", QDBusData::fromBool(_vpncWidget->chkDisableNatTraversal->isChecked()));
- strlist.insert("Enable Single DES", QDBusData::fromBool(_vpncWidget->chkSingleDES->isChecked()));
+ strlist.insert("Disable NAT Traversal", QString::number(_vpncWidget->chkDisableNatTraversal->isChecked()));
+ strlist.insert("Enable Single DES", QString::number(_vpncWidget->chkSingleDES->isChecked()));
return strlist;
}
@@ -206,10 +206,10 @@
}
-QMap VPNCAuthentication::getPasswords()
+QMap VPNCAuthentication::getPasswords()
{
- QMap pwds;
- pwds.insert("IPSec secret", QDBusData::fromString(_vpncAuth->editGroupPassword->password()));
- pwds.insert("Xauth password", QDBusData::fromString(_vpncAuth->editUserPassword->password()));
+ QMap pwds;
+ pwds.insert("IPSec secret", QString(_vpncAuth->editGroupPassword->password()));
+ pwds.insert("Xauth password", QString(_vpncAuth->editUserPassword->password()));
return pwds;
}
diff -ur BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h
--- BUILD/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h 2008-08-18 08:19:15.000000000 +0200
+++ BUILD2/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h 2008-09-25 13:58:30.000000000 +0200
@@ -49,8 +49,8 @@
{
Q_OBJECT
public:
- void setVPNData(const QStringList& routes, const QMap& properties);
- QMap getVPNProperties();
+ void setVPNData(const QStringList& routes, const QMap& properties);
+ QMap getVPNProperties();
QStringList getVPNRoutes();
bool hasChanged();
bool isValid(QStringList& );
@@ -71,7 +71,7 @@
public:
VPNCAuthentication(QWidget* parent = NULL, char* name = NULL);
~VPNCAuthentication();
- QMap getPasswords();
+ QMap getPasswords();
private:
VPNCAuthenticationWidget* _vpncAuth;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org