X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=ccfa2a1be629ac3b9e2560edbeb5130dba62b02f;hp=4946711858a2f8bb2315b68c27dd589b5859aff9;hb=47b574c28983254b6679191f76ddb36fe7da7632;hpb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 49467118..ccfa2a1b 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -46,10 +46,19 @@ CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_st
   connect(this, SIGNAL(backlogData(BufferId, QList<QVariant>, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList<QVariant>, bool)));
   connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
   connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
-  connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
-  connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
   connect(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), coreProxy, SLOT(csSessionDataChanged(const QString &, const QVariant &)));
   connect(coreProxy, SIGNAL(gsSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
+
+  /* Autoconnect. (When) do we actually do this?
+  QStringList list;
+  VarMap networks = retrieveSessionData("Networks").toMap();
+  foreach(QString net, networks.keys()) {
+    if(networks[net].toMap()["AutoConnect"].toBool()) {
+      list << net;
+    }
+  } qDebug() << list;
+  if(list.count()) connectToIrc(list);
+  */
 }
 
 CoreSession::~CoreSession() {
@@ -64,13 +73,6 @@ void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2,
   coreProxy->recv(sig, arg1, arg2, arg3);
 }
 
-void CoreSession::globalDataUpdated(UserId uid, QString key) {
-  Q_ASSERT(uid == userId());
-  QVariant data = Global::data(userId(), key);
-  QSettings s;
-  s.setValue(QString("Global/%1/").arg(userId())+key, data);
-}
-
 void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
   QSettings s;
   s.beginGroup(QString("SessionData/%1").arg(user));
@@ -156,7 +158,7 @@ void CoreSession::recvMessageFromServer(Message::Type type, QString target, QStr
     buf = storage->getBufferId(user, s->getNetwork(), target);
   }
   Message msg(buf, type, text, sender, flags);
-  msg.msgId = storage->logMessage(msg); //qDebug() << msg.msgId;
+  msg.msgId = storage->logMessage(msg);
   Q_ASSERT(msg.msgId);
   emit displayMsg(msg);
 }
@@ -181,7 +183,8 @@ QVariant CoreSession::sessionState() {
   mutex.lock();
   v["SessionData"] = sessionData;
   mutex.unlock();
-
+  v["Networks"] = QVariant(servers.keys());
+  // v["Payload"] = QByteArray(100000000, 'a');
   return v;
 }