From: Javier Llorente <javier@opensuse.org>
Date: Sun, 10 Sep 2017 21:28:26 +0000 (+0200)
Subject: Move account details out of 'ManualProxy'
X-Git-Tag: travis-deploy-test~175
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=820eb961588dccc83892682f14351fbcf93fc0a0

Move account details out of 'ManualProxy'
---

diff --git a/src/qtui/settingspages/coreaccountsettingspage.cpp b/src/qtui/settingspages/coreaccountsettingspage.cpp
index b8b09fef..31dd8338 100644
--- a/src/qtui/settingspages/coreaccountsettingspage.cpp
+++ b/src/qtui/settingspages/coreaccountsettingspage.cpp
@@ -294,6 +294,13 @@ CoreAccountEditDlg::CoreAccountEditDlg(const CoreAccount &acct, QWidget *parent)
 
 CoreAccount CoreAccountEditDlg::account()
 {
+    _account.setAccountName(ui.accountName->text().trimmed());
+    _account.setHostName(ui.hostName->text().trimmed());
+    _account.setPort(ui.port->value());
+    _account.setUser(ui.user->text().trimmed());
+    _account.setPassword(ui.password->text());
+    _account.setStorePassword(ui.rememberPassword->isChecked());
+
     QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy;
     int checkedId = ui.buttonGroupProxyType->checkedId();
 
@@ -310,12 +317,6 @@ CoreAccount CoreAccountEditDlg::account()
         proxyType = ui.proxyType->currentIndex() == 0 ?
                     QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
         QNetworkProxyFactory::setUseSystemConfiguration(false);
-        _account.setAccountName(ui.accountName->text().trimmed());
-        _account.setHostName(ui.hostName->text().trimmed());
-        _account.setPort(ui.port->value());
-        _account.setUser(ui.user->text().trimmed());
-        _account.setPassword(ui.password->text());
-        _account.setStorePassword(ui.rememberPassword->isChecked());
         _account.setProxyHostName(ui.proxyHostName->text().trimmed());
         _account.setProxyPort(ui.proxyPort->value());
         _account.setProxyType(proxyType);