X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=fb8bebc2f0e67c38b41d070697d2a7d44f0c68d9;hp=0c6993b87e239e4a8d8c014523d655431bbdfe42;hb=236dda81632fa792e788d45b0f4f31b973823f7f;hpb=c45a002f4e8d5a1faa9fb6804e85d875862210db
diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 0c6993b8..fb8bebc2 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -123,10 +123,10 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
#ifdef HAVE_SSL
QSslSocket *sock = new QSslSocket(Client::instance());
+ connect(sock, SIGNAL(encrypted()), this, SIGNAL(encrypted()));
#else
if(conn["useSsl"].toBool()) {
emit connectionError(tr("This client is built without SSL Support!
Disable the usage of SSL in the account settings."));
- emit encrypted(false);
return;
}
QTcpSocket *sock = new QTcpSocket(Client::instance());
@@ -229,11 +229,8 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
Q_ASSERT(sslSocket);
connect(sslSocket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &)));
sslSocket->startClientEncryption();
- emit encrypted(true);
- Client::instance()->setSecuredConnection();
} else {
emit connectionError(tr("The Quassel Core you are trying to connect to does not support SSL!
If you want to connect anyways, disable the usage of SSL in the account settings."));
- emit encrypted(false);
disconnectFromCore();
return;
}