X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=b7b2088d43e4c3684fba1185d0759458bcb5c73f;hp=2c2a5df537323b27bc744f6d4a4cec15218ab82d;hb=d1a410b43b09e31472b860bc5f5bbf9c253c047e;hpb=9a36f8e55bfa485467e093fba669841fdfacda2f

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 2c2a5df5..b7b2088d 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -20,7 +20,9 @@
 
 #include "clientsyncer.h"
 
-#include <QNetworkProxy>
+#ifndef QT_NO_NETWORKPROXY
+#  include <QNetworkProxy>
+#endif
 
 #include "client.h"
 #include "global.h"
@@ -131,11 +133,12 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
     }
     QTcpSocket *sock = new QTcpSocket(Client::instance());
 #endif
-
+#ifndef QT_NO_NETWORKPROXY
     if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
       QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
       sock->setProxy(proxy);
     }
+#endif
     socket = sock;
     connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
     connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
@@ -193,6 +196,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
       connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
       sslSocket->startClientEncryption();
       emit encrypted(true);
+      Client::instance()->setSecuredConnection();
     } else {
       emit connectionError(tr("<b>The Quassel Core you are trying to connect to does not support SSL!</b><br />If you want to connect anyways, disable the usage of SSL in the account settings."));
       emit encrypted(false);