From 89f7f75af28dbfe2b2dec01ff4c976595c6e7242 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 18 Feb 2013 17:16:10 +0200 Subject: [PATCH] If a new server is configured, take the proxy config to the new config file. --- src/mirall/owncloudsetupwizard.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 9e5a653bfa..3c6d8125fc 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -172,6 +172,15 @@ void OwncloudSetupWizard::testOwnCloudConnect() _ocWizard->field(QLatin1String("secureConnect")).toBool(), _ocWizard->field(QLatin1String("PwdNoLocalStore")).toBool() ); + // If there is already a config, take its proxy config. + if( ownCloudInfo::instance()->isConfigured() ) { + MirallConfigFile prevCfg; + if( prevCfg.proxyType() != QNetworkProxy::DefaultProxy ) { + cfgFile.setProxyType( prevCfg.proxyType(), prevCfg.proxyHostName(), prevCfg.proxyPort(), + prevCfg.proxyUser(), prevCfg.proxyPassword() ); + } + } + // now start ownCloudInfo to check the connection. ownCloudInfo* info = ownCloudInfo::instance(); info->setCustomConfigHandle( _configHandle );