X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=c515faed478b56dbf04f89956c14e9f58d7538bf;hb=6f91e87de27d7bb0972dde4c836d55ab5bfc0592;hp=433abbff8a1eb0e6b15561ec5cb7a132e5f10a45;hpb=22d6ab71ce70b20f2d2657a27e968570b3dcb837;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 433abbff..c515faed 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -22,7 +22,7 @@
 
 #include "core.h"
 #include "coresession.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
 #include "signalproxy.h"
 #include "corebuffersyncer.h"
 #include "corebacklogmanager.h"
@@ -62,6 +62,9 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _ignoreListManager(this)
 {
   SignalProxy *p = signalProxy();
+  p->setHeartBeatInterval(30);
+  p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
+
   connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
 
   connect(p, SIGNAL(connected()), this, SLOT(clientsConnected()));
@@ -130,11 +133,11 @@ void CoreSession::loadSettings() {
     QList<NetworkInfo>::iterator networkIter = networkInfos.begin();
     while(networkIter != networkInfos.end()) {
       if(networkIter->identity == id) {
-	networkIter->identity = newId;
-	Core::updateNetwork(user(), *networkIter);
-	networkIter = networkInfos.erase(networkIter);
+        networkIter->identity = newId;
+        Core::updateNetwork(user(), *networkIter);
+        networkIter = networkInfos.erase(networkIter);
       } else {
-	networkIter++;
+        networkIter++;
       }
     }
     s.removeIdentity(id);
@@ -154,8 +157,6 @@ void CoreSession::saveSessionState() const {
   _bufferSyncer->storeDirtyIds();
   _bufferViewManager->saveBufferViews();
   _networkConfig->save();
-  _aliasManager.save();
-  _ignoreListManager.save();
 }
 
 void CoreSession::restoreSessionState() {
@@ -251,7 +252,8 @@ void CoreSession::processMessages() {
     BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
     Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
 
-    networkName = _networks.value(bufferInfo.networkId())->networkName();
+    CoreNetwork *currentNetwork = network(bufferInfo.networkId());
+    networkName = currentNetwork ? currentNetwork->networkName() : QString("");
     // if message is ignored with "HardStrictness" we discard it here
     if(_ignoreListManager.match(msg, networkName) != IgnoreListManager::HardStrictness) {
       Core::storeMessage(msg);
@@ -264,14 +266,15 @@ void CoreSession::processMessages() {
     for(int i = 0; i < _messageQueue.count(); i++) {
       const RawMessage &rawMsg = _messageQueue.at(i);
       if(bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
-	bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
+        bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
       } else {
-	bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
-	bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+        bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
+        bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
       }
 
       Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
-      networkName = _networks.value(bufferInfo.networkId())->networkName();
+      CoreNetwork *currentNetwork = network(bufferInfo.networkId());
+      networkName = currentNetwork ? currentNetwork->networkName() : QString("");
       // if message is ignored with "HardStrictness" we discard it here
       if(_ignoreListManager.match(msg, networkName) == IgnoreListManager::HardStrictness)
         continue;
@@ -290,6 +293,8 @@ void CoreSession::processMessages() {
 QVariant CoreSession::sessionState() {
   QVariantMap v;
 
+  v["CoreFeatures"] = (int)Quassel::features();
+
   QVariantList bufs;
   foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
   v["BufferInfos"] = bufs;
@@ -497,7 +502,7 @@ void CoreSession::clientsDisconnected() {
 
     if(identity->detachAwayEnabled() && !me->isAway()) {
       if(!identity->detachAwayReason().isEmpty())
-	awayReason = identity->detachAwayReason();
+        awayReason = identity->detachAwayReason();
       net->setAutoAwayActive(true);
       net->userInputHandler()->handleAway(BufferInfo(), awayReason);
     }