From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 29 May 2008 18:18:44 +0000 (+0000)
Subject: Since the last fix had some nasty side effects (too many buffers were
X-Git-Tag: 0.2.0-rc1~78
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0e5aee8ca6e5663c580c05fae9b06d2424abce5f

Since the last fix had some nasty side effects (too many buffers were
added automagically) this additional fix is needed *sigh*
Needs core update to get the full flavour. Distclean adviced.
---

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index 88c9dc0e..27d32976 100644
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -130,7 +130,7 @@ void BufferViewConfig::initSetBufferList(const QList<BufferId> &buffers) {
   emit bufferListSet();
 }
 
-QVariantList BufferViewConfig::initRemovedBuffersList() const {
+QVariantList BufferViewConfig::initRemovedBuffers() const {
   QVariantList removedBuffers;
 
   foreach(BufferId bufferId, _removedBuffers) {
@@ -140,7 +140,7 @@ QVariantList BufferViewConfig::initRemovedBuffersList() const {
   return removedBuffers;
 }
 
-void BufferViewConfig::initSetRemovedBuffersList(const QVariantList &buffers) {
+void BufferViewConfig::initSetRemovedBuffers(const QVariantList &buffers) {
   _removedBuffers.clear();
 
   foreach(QVariant buffer, buffers) {
@@ -148,6 +148,24 @@ void BufferViewConfig::initSetRemovedBuffersList(const QVariantList &buffers) {
   }
 }
 
+QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const {
+  QVariantList temporarilyRemovedBuffers;
+
+  foreach(BufferId bufferId, _temporarilyRemovedBuffers) {
+    temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+  }
+
+  return temporarilyRemovedBuffers;
+}
+
+void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList &buffers) {
+  _temporarilyRemovedBuffers.clear();
+
+  foreach(QVariant buffer, buffers) {
+    _temporarilyRemovedBuffers << buffer.value<BufferId>();
+  }
+}
+
 void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
   if(_buffers.contains(bufferId))
     return;
@@ -160,6 +178,9 @@ void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
   if(_removedBuffers.contains(bufferId))
     _removedBuffers.remove(bufferId);
   
+  if(_temporarilyRemovedBuffers.contains(bufferId))
+    _temporarilyRemovedBuffers.remove(bufferId);
+  
   _buffers.insert(pos, bufferId);
   emit bufferAdded(bufferId, pos);
 }
@@ -178,16 +199,23 @@ void BufferViewConfig::moveBuffer(const BufferId &bufferId, int pos) {
 }
 
 void BufferViewConfig::removeBuffer(const BufferId &bufferId) {
-  if(!_buffers.contains(bufferId))
-    return;
+  if(_buffers.contains(bufferId))
+    _buffers.removeAt(_buffers.indexOf(bufferId));
   
-  _buffers.removeAt(_buffers.indexOf(bufferId));
+  if(_removedBuffers.contains(bufferId))
+    _removedBuffers.remove(bufferId);
+
+  _temporarilyRemovedBuffers << bufferId;
+
   emit bufferRemoved(bufferId);
 }
 
 void BufferViewConfig::removeBufferPermanently(const BufferId &bufferId) {
   if(_buffers.contains(bufferId))
     _buffers.removeAt(_buffers.indexOf(bufferId));
+
+  if(_temporarilyRemovedBuffers.contains(bufferId))
+    _temporarilyRemovedBuffers.remove(bufferId);
   
   _removedBuffers << bufferId;
 
diff --git a/src/common/bufferviewconfig.h b/src/common/bufferviewconfig.h
index 81e2cb33..3c88580c 100644
--- a/src/common/bufferviewconfig.h
+++ b/src/common/bufferviewconfig.h
@@ -68,13 +68,17 @@ public slots:
 
   const QList<BufferId> &bufferList() const { return _buffers; }
   const QSet<BufferId> &removedBuffers() const { return _removedBuffers; }
+  const QSet<BufferId> &temporarilyRemovedBuffers() const { return _temporarilyRemovedBuffers; }
 
   QVariantList initBufferList() const;
   void initSetBufferList(const QVariantList &buffers);
   void initSetBufferList(const QList<BufferId> &buffers);
 
-  QVariantList initRemovedBuffersList() const;
-  void initSetRemovedBuffersList(const QVariantList &buffers);
+  QVariantList initRemovedBuffers() const;
+  void initSetRemovedBuffers(const QVariantList &buffers);
+
+  QVariantList initTemporarilyRemovedBuffers() const;
+  void initSetTemporarilyRemovedBuffers(const QVariantList &buffers);
 
   void addBuffer(const BufferId &bufferId, int pos);
   virtual inline void requestAddBuffer(const BufferId &bufferId, int pos) { emit addBufferRequested(bufferId, pos); }
@@ -118,6 +122,7 @@ private:
   int _minimumActivity;
   QList<BufferId> _buffers;
   QSet<BufferId> _removedBuffers;
+  QSet<BufferId> _temporarilyRemovedBuffers;
 };
 
 #endif // BUFFERVIEWCONFIG_H
diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index e097c30f..5dcb7e8c 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -167,12 +167,26 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
 }
 
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
-  Q_ASSERT(bufferId.isValid());
+  // no config -> "all buffers" -> accept everything
   if(!config())
     return true;
 
+  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+  Q_ASSERT(bufferId.isValid());
+
   int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt();
+
+  if(!config()->bufferList().contains(bufferId)) {
+    // add the buffer if...
+    if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
+       && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
+	   || activityLevel > Buffer::OtherActivity)) { // or was just temporarily hidden and has a new message waiting for us.
+      addBuffer(bufferId);
+    }
+    // note: adding the buffer to the valid list does not temper with the filters ("show only channels" and stuff)
+    return false;
+  }
+  
   if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
 
@@ -187,15 +201,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
       return false;
   }
 
-  if(config()->bufferList().contains(bufferId))
-    return true;
-
-  if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId)
-     && (activityLevel > Buffer::OtherActivity || config()->addNewBuffersAutomatically())) {
-    addBuffer(bufferId);
-  }
-  
-  return false;
+  return true;
 }
 
 bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
diff --git a/version.inc b/version.inc
index 2c33707c..eee76795 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-beta2-pre";
   quasselDate = "2008-05-29";
-  quasselBuild = 862;
+  quasselBuild = 865;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;