File fix_vpn_api.patch of Package NetworkManager-kde
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<QString, QString> VPNConfigWidget::getVPNProperties()
{
- return QMap<QString, QDBusData>();
+ return QMap<QString, QString>();
}
QStringList VPNConfigWidget::getVPNRoutes()
@@ -82,9 +82,9 @@
}
-QMap<QString, QDBusData> VPNAuthenticationWidget::getPasswords()
+QMap<QString, QString> VPNAuthenticationWidget::getPasswords()
{
- return QMap<QString, QDBusData>();
+ return QMap<QString, QString>();
}
void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap<QString, QString>& /*properties*/)