[PATCH 1/5] Use separate plugin method to query secret during connection
Andrey Borzenkov
arvidjaar at gmail.com
Fri Nov 26 18:19:41 CET 2010
From: Andrey Borzenkov <arvidjaar at mail.ru>
Full fledged settings UI during connection is not required.
Signed-off-by: Andrey Borzenkov <arvidjaar at mail.ru>
---
libs/ui/connectionsecretsjob.cpp | 2 +-
libs/ui/vpnuiplugin.h | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libs/ui/connectionsecretsjob.cpp b/libs/ui/connectionsecretsjob.cpp
index bd7f253..2d92f7f 100644
--- a/libs/ui/connectionsecretsjob.cpp
+++ b/libs/ui/connectionsecretsjob.cpp
@@ -149,7 +149,7 @@ void ConnectionSecretsJob::doAskUser()
QString error;
VpnUiPlugin * uiPlugin = KServiceTypeTrader::createInstanceFromQuery<VpnUiPlugin>( QString::fromLatin1( "NetworkManagement/VpnUiPlugin" ), QString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg(vpnSetting->pluginName() ), this, QVariantList(), &error );
if (uiPlugin && error.isEmpty()) {
- m_settingWidget= uiPlugin->widget(m_connection, 0);
+ m_settingWidget= uiPlugin->askUser(m_connection, 0);
}
} else if ( mSettingName == QLatin1String(NM_SETTING_WIRED_SETTING_NAME)) {
m_settingWidget = new WiredWidget(m_connection, 0);
diff --git a/libs/ui/vpnuiplugin.h b/libs/ui/vpnuiplugin.h
index c06608b..b149c45 100644
--- a/libs/ui/vpnuiplugin.h
+++ b/libs/ui/vpnuiplugin.h
@@ -45,6 +45,7 @@ public:
virtual ~VpnUiPlugin();
virtual SettingWidget * widget(Knm::Connection * connection, QWidget * parent = 0) = 0;
+ SettingWidget * askUser(Knm::Connection * connection, QWidget * parent = 0){ return widget(connection, parent); };
private:
class Private;
Private * d;
--
1.7.3.2
More information about the kde-networkmanager
mailing list