X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreaccountsettingspage.cpp;h=c1d039115eabd1bd5a04aab9ba2fc0ad5feb937c;hb=911f181e0e179eb51279c0880eb701a43163b8b5;hp=b8b09fef66a60557f1409a3fd5616aedaaeeb5c4;hpb=9ddb5712b16b3219338871d346765bc649007de0;p=quassel.git diff --git a/src/qtui/settingspages/coreaccountsettingspage.cpp b/src/qtui/settingspages/coreaccountsettingspage.cpp index b8b09fef..c1d03911 100644 --- a/src/qtui/settingspages/coreaccountsettingspage.cpp +++ b/src/qtui/settingspages/coreaccountsettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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);