X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=c9891d23bb65738ec6c8e347ad29bb8494ef8cbb;hp=22ed212136102c7fa1735e1b4dbbb8c81a70f5a1;hb=04754cf669dd295205226b744bc769b94693866a;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 22ed2121..c9891d23 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -70,9 +70,11 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
   initScriptEngine();
 
   // init BufferSyncer
-  //QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
-  //foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
-  // FIXME connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
+  QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
+  foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
+  connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
+  connect(_bufferSyncer, SIGNAL(removeBufferRequested(BufferId)), this, SLOT(removeBufferRequested(BufferId)));
+  connect(this, SIGNAL(bufferRemoved(BufferId)), _bufferSyncer, SLOT(removeBuffer(BufferId)));
   p->synchronize(_bufferSyncer);
 
   // Restore session state
@@ -230,7 +232,7 @@ void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState)
 
 void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
   connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
-  connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+  connect(conn, SIGNAL(quitRequested(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
 
   // I guess we don't need these anymore, client-side can just connect the network's signals directly
   //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
@@ -272,11 +274,8 @@ void CoreSession::networkConnected(NetworkId networkid) {
   Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
 }
 
+// called now only on /quit and requested disconnects, not on normal disconnects!
 void CoreSession::networkDisconnected(NetworkId networkid) {
-  // FIXME
-  // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise
-
-  //Q_ASSERT(_connections.contains(networkid));
   if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
 }
 
@@ -448,7 +447,7 @@ void CoreSession::updateNetwork(const NetworkInfo &info) {
     qWarning() << "Update request for unknown network received!";
     return;
   }
-  _networks[info.networkId]->setNetworkInfo(info); qDebug() << "unlim" << info.unlimitedReconnectRetries << _networks[info.networkId]->unlimitedReconnectRetries();
+  _networks[info.networkId]->setNetworkInfo(info);
   Core::updateNetwork(user(), info);
 }
 
@@ -476,3 +475,28 @@ void CoreSession::destroyNetwork(NetworkId id) {
     net->deleteLater();
   }
 }
+
+void CoreSession::removeBufferRequested(BufferId bufferId) {
+  BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
+  if(!bufferInfo.isValid()) {
+    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+    return;
+  }
+  
+  if(bufferInfo.type() == BufferInfo::StatusBuffer) {
+    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+    return;
+  }
+  
+  if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
+    Network *net = network(bufferInfo.networkId());
+    Q_ASSERT(net);
+    IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
+    if(chan) {
+      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+      return;
+    }
+  }
+  if(Core::removeBuffer(user(), bufferId))
+    emit bufferRemoved(bufferId);
+}