X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=9534b6fd84d8444a3a4c1a5748a0a71aceba71d2;hp=dfadf321664c7a728d8b496d62008d591d17dc21;hb=26c15c14a067c8709d2e04ef9d8965550dcee52d;hpb=a2d4978097260c8af1f51ade497071793db2a0c0

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index dfadf321..9534b6fd 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -20,6 +20,8 @@
 
 #include "clientsyncer.h"
 
+#include <QNetworkProxy>
+
 #include "client.h"
 #include "global.h"
 #include "identity.h"
@@ -119,6 +121,10 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
     //emit coreConnectionMsg(tr("Connecting..."));
     Q_ASSERT(!socket);
     QTcpSocket *sock = new QTcpSocket(Client::instance());
+    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);
+    }
     socket = sock;
     connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
     connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));