X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=c9891d23bb65738ec6c8e347ad29bb8494ef8cbb;hb=78f804479b1278b89adf09e41a8cc33236562430;hp=4a798eae0b1c3aeb0c12f895940b304275e5bdde;hpb=52a4b82e170fe88725de8381c842a5278c7d1e46;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 4a798eae..c9891d23 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -73,6 +73,8 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
   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
@@ -473,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);
+}