From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 25 Dec 2008 15:27:45 +0000 (+0100)
Subject: putting it all together: core is now capable to connect to ircservers using a proxy... 
X-Git-Tag: 0.4.0~336
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7e18cab1aef55e7720c70319d98fd0c2bce7c160;hp=d747c2060a17ddc24dcc83d6a7aa87066765c9dc

putting it all together: core is now capable to connect to ircservers using a proxy, a specific ssl version, a ssl cert, a ssl key
---

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 8911cb0e..0fd68b16 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -163,10 +163,16 @@ void CoreNetwork::connectToIrc(bool reconnecting) {
 
 #ifdef HAVE_SSL
   socket.setProtocol((QSsl::SslProtocol)server.sslVersion);
-  if(server.useSsl)
+  if(server.useSsl) {
+    CoreIdentity *identity = identityPtr();
+    if(identity) {
+      socket.setLocalCertificate(identity->sslCert());
+      socket.setPrivateKey(identity->sslKey());
+    }
     socket.connectToHostEncrypted(server.host, server.port);
-  else
+  } else {
     socket.connectToHost(server.host, server.port);
+  }
 #else
   socket.connectToHost(server.host, server.port);
 #endif