projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d747c20
)
putting it all together: core is now capable to connect to ircservers using a proxy...
author
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 25 Dec 2008 15:27:45 +0000
(16:27 +0100)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 25 Dec 2008 23:03:50 +0000
(
00:03
+0100)
src/core/corenetwork.cpp
patch
|
blob
|
history
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
8911cb0
..
0fd68b1
100644
(file)
--- 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