#endif
#include "client.h"
-#include "global.h"
#include "identity.h"
#include "ircuser.h"
#include "ircchannel.h"
#include "network.h"
+#include "networkmodel.h"
+#include "quassel.h"
#include "signalproxy.h"
-
ClientSyncer::ClientSyncer(QObject *parent)
: QObject(parent)
{
//emit coreConnectionMsg(tr("Connecting..."));
Q_ASSERT(!socket);
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
QSslSocket *sock = new QSslSocket(Client::instance());
#else
if(conn["useSsl"].toBool()) {
}
emit connectionMsg(msg["CoreInfo"].toString());
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
if(coreConnectionInfo["useSsl"].toBool()) {
if(msg["SupportSsl"].toBool()) {
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
socket->setProperty("UseCompression", true);
}
#endif
-
+
if(!msg["Configured"].toBool()) {
// start wizard
emit startCoreSetup(msg["StorageBackends"].toList());
// create buffers
// FIXME: get rid of this crap
QVariantList bufferinfos = sessionState["BufferInfos"].toList();
+ NetworkModel *networkModel = Client::networkModel();
+ Q_ASSERT(networkModel);
foreach(QVariant vinfo, bufferinfos)
- Client::buffer(vinfo.value<BufferInfo>()); // create Buffers and BufferItems
+ networkModel->bufferUpdated(vinfo.value<BufferInfo>()); // create BufferItems
QVariantList networkids = sessionState["NetworkIds"].toList();
}
}
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
qDebug() << "SSL Errors:";
foreach(QSslError err, errors)