← Back to branch summary

~ubuntu-branches/ubuntu/vivid/quassel/vivid-updates

« back to all changes in this revision

Viewing changes to src/qtui/settingspages/networkssettingspage.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2014-03-16 17:49:07 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20140316174907-0d5f03zhdmv03chp
Tags: 0.10~rc1-0ubuntu1
New upstream RC release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtui/settingspages/networkssettingspage.cpp
867
867
    ui.port->setValue(server.port);
868
868
    ui.password->setText(server.password);
869
869
    ui.useSSL->setChecked(server.useSsl);
870
 
    ui.sslVersion->setCurrentIndex(server.sslVersion);
871
870
    ui.useProxy->setChecked(server.useProxy);
872
871
    ui.proxyType->setCurrentIndex(server.proxyType == QNetworkProxy::Socks5Proxy ? 0 : 1);
873
872
    ui.proxyHost->setText(server.proxyHost);
881
880
Network::Server ServerEditDlg::serverData() const
882
881
{
883
882
    Network::Server server(ui.host->text().trimmed(), ui.port->value(), ui.password->text(), ui.useSSL->isChecked());
884
 
    server.sslVersion = ui.sslVersion->currentIndex();
885
883
    server.useProxy = ui.useProxy->isChecked();
886
884
    server.proxyType = ui.proxyType->currentIndex() == 0 ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
887
885
    server.proxyHost = ui.proxyHost->text();