X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=9ac44d28c7f001f7062735c0814a8cd260fe0332;hp=ae0bdb282111aeb69703b1a7c695fa4069b935cd;hb=38db2f48a30f697ef8c0b61dfa6345e8a53336fd;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index ae0bdb28..9ac44d28 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -26,6 +26,14 @@
 CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_storage) {
   coreProxy = new CoreProxy();
 
+  QSettings s;
+  s.beginGroup(QString("SessionData/%1").arg(user));
+  mutex.lock();
+  foreach(QString key, s.allKeys()) {
+    sessionData[key] = s.value(key);
+  }
+  mutex.unlock();
+
   connect(coreProxy, SIGNAL(send(CoreSignal, QVariant, QVariant, QVariant)), this, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)));
   connect(coreProxy, SIGNAL(requestServerStates()), this, SIGNAL(serverStateRequested()));
   connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList)));
@@ -38,8 +46,8 @@ 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 &)));
 }
 
 CoreSession::~CoreSession() {
@@ -54,11 +62,25 @@ 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);
+void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
   QSettings s;
-  s.setValue(QString("Global/%1/").arg(userId())+key, data);
+  s.beginGroup(QString("SessionData/%1").arg(user));
+  mutex.lock();
+  sessionData[key] = data;
+  s.setValue(key, data);
+  mutex.unlock();
+  s.endGroup();
+  emit sessionDataChanged(key, data);
+  emit sessionDataChanged(key);
+}
+
+QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
+  QVariant data;
+  mutex.lock();
+  if(!sessionData.contains(key)) data = def;
+  else data = sessionData[key];
+  mutex.unlock();
+  return data;
 }
 
 void CoreSession::connectToIrc(QStringList networks) {
@@ -125,7 +147,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);
 }
@@ -147,7 +169,11 @@ QVariant CoreSession::sessionState() {
   QList<QVariant> bufs;
   foreach(BufferId id, storage->requestBuffers(user)) { bufs.append(QVariant::fromValue(id)); }
   v["Buffers"] = bufs;
-
+  mutex.lock();
+  v["SessionData"] = sessionData;
+  mutex.unlock();
+  v["Networks"] = QVariant(servers.keys());
+  v["Payload"] = QByteArray(100000000, 'a');
   return v;
 }