fixes #484 - issues with ssl status indicator

[quassel.git] / src / client / clientsyncer.cpp

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 139f44b..fb8bebc 100644 (file)
--- 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  *
@@ -26,8 +26,6 @@
 
 #include "client.h"
 #include "identity.h"
-#include "ircuser.h"
-#include "ircchannel.h"
 #include "network.h"
 #include "networkmodel.h"
 #include "quassel.h"
@@ -125,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("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
-       emit encrypted(false);
        return;
     }
     QTcpSocket *sock = new QTcpSocket(Client::instance());
@@ -169,9 +167,35 @@ void ClientSyncer::coreSocketConnected() {
   SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
-void ClientSyncer::useInternalCore(AccountId internalAccountId) {
+void ClientSyncer::useInternalCore() {
+  AccountId internalAccountId;
+
+  CoreAccountSettings accountSettings;
+  QList<AccountId> knownAccounts = accountSettings.knownAccounts();
+  foreach(AccountId id, knownAccounts) {
+    if(!id.isValid())
+      continue;
+    QVariantMap data = accountSettings.retrieveAccountData(id);
+    if(data.contains("InternalAccount") && data["InternalAccount"].toBool()) {
+      internalAccountId = id;
+      break;
+    }
+  }
+
+  if(!internalAccountId.isValid()) {
+    for(AccountId i = 1;; i++) {
+      if(!knownAccounts.contains(i)) {
+       internalAccountId = i;
+       break;
+      }
+    }
+    QVariantMap data;
+    data["InternalAccount"] = true;
+    accountSettings.storeAccountData(internalAccountId, data);
+  }
+
   coreConnectionInfo["AccountId"] = QVariant::fromValue<AccountId>(internalAccountId);
-  emit startInternalCore();
+  emit startInternalCore(this);
   emit connectToInternalCore(Client::instance()->signalProxy());
 }
 
@@ -205,11 +229,8 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
       Q_ASSERT(sslSocket);
       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);
       disconnectFromCore();
       return;
     }