Use autonegotiation to choose an SSL protocol.

[quassel.git] / src / qtui / settingspages / networkssettingspage.cpp

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 6ae5f51..6f15075 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *

  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -45,9 +45,9 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
     if (!(Client::coreFeatures() & Quassel::SaslAuthentication))
         ui.sasl->hide();
     if (!(Client::coreFeatures() & Quassel::SaslExternal))
     if (!(Client::coreFeatures() & Quassel::SaslAuthentication))
         ui.sasl->hide();
     if (!(Client::coreFeatures() & Quassel::SaslExternal))

-        ui.label_saslext->hide();
+        ui.saslExtInfo->hide();

 #ifndef HAVE_SSL
 #ifndef HAVE_SSL

-    ui.label_saslext->hide();
+    ui.saslExtInfo->hide();

 #endif
 
     // set up icons
 #endif
 
     // set up icons


@@ -582,16 +582,16 @@ void NetworksSettingsPage::sslUpdated()
 {
     if (_cid && !_cid->sslKey().isNull()) {
         ui.saslAccount->setDisabled(true);
 {
     if (_cid && !_cid->sslKey().isNull()) {
         ui.saslAccount->setDisabled(true);

-        ui.label_10->setDisabled(true);
+        ui.saslAccountLabel->setDisabled(true);

         ui.saslPassword->setDisabled(true);
         ui.saslPassword->setDisabled(true);

-        ui.label_11->setDisabled(true);
-        ui.label_saslext->setHidden(false);
+        ui.saslPasswordLabel->setDisabled(true);
+        ui.saslExtInfo->setHidden(false);

     } else {
         ui.saslAccount->setDisabled(false);
     } else {
         ui.saslAccount->setDisabled(false);

-        ui.label_10->setDisabled(false);
+        ui.saslAccountLabel->setDisabled(false);

         ui.saslPassword->setDisabled(false);
         ui.saslPassword->setDisabled(false);

-        ui.label_11->setDisabled(false);
-        ui.label_saslext->setHidden(true);
+        ui.saslPasswordLabel->setDisabled(false);
+        ui.saslExtInfo->setHidden(true);

     }
 }
 #endif
     }
 }
 #endif


@@ -867,7 +867,6 @@ ServerEditDlg::ServerEditDlg(const Network::Server &server, QWidget *parent) : Q
     ui.port->setValue(server.port);
     ui.password->setText(server.password);
     ui.useSSL->setChecked(server.useSsl);
     ui.port->setValue(server.port);
     ui.password->setText(server.password);
     ui.useSSL->setChecked(server.useSsl);

-    ui.sslVersion->setCurrentIndex(server.sslVersion);

     ui.useProxy->setChecked(server.useProxy);
     ui.proxyType->setCurrentIndex(server.proxyType == QNetworkProxy::Socks5Proxy ? 0 : 1);
     ui.proxyHost->setText(server.proxyHost);
     ui.useProxy->setChecked(server.useProxy);
     ui.proxyType->setCurrentIndex(server.proxyType == QNetworkProxy::Socks5Proxy ? 0 : 1);
     ui.proxyHost->setText(server.proxyHost);


@@ -881,7 +880,6 @@ ServerEditDlg::ServerEditDlg(const Network::Server &server, QWidget *parent) : Q
 Network::Server ServerEditDlg::serverData() const
 {
     Network::Server server(ui.host->text().trimmed(), ui.port->value(), ui.password->text(), ui.useSSL->isChecked());
 Network::Server ServerEditDlg::serverData() const
 {
     Network::Server server(ui.host->text().trimmed(), ui.port->value(), ui.password->text(), ui.useSSL->isChecked());

-    server.sslVersion = ui.sslVersion->currentIndex();

     server.useProxy = ui.useProxy->isChecked();
     server.proxyType = ui.proxyType->currentIndex() == 0 ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
     server.proxyHost = ui.proxyHost->text();
     server.useProxy = ui.useProxy->isChecked();
     server.proxyType = ui.proxyType->currentIndex() == 0 ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
     server.proxyHost = ui.proxyHost->text();