From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 14 Apr 2008 23:37:02 +0000 (+0000)
Subject: - "All Buffers" are now sorted as they used to be
X-Git-Tag: 0.2.0-beta1~44
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ac84f5fd1e6a260bf4c147f623fae22ec3220647;ds=sidebyside

- "All Buffers" are now sorted as they used to be
- fixed a bug where multiple buffer views, restricted to different nets could result in client crashes
---

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index a14ab031..3e4886cd 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -148,6 +148,9 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
   if(!_config)
     return true;
 
+  if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
+    return false;
+
   if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
     return false;
 
@@ -206,7 +209,7 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod
   if(config()) {
     return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId);
   } else
-    return leftBufferId < rightBufferId;
+    return bufferIdLessThan(leftBufferId, rightBufferId);
 }
 
 bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
diff --git a/version.inc b/version.inc
index 7f81fdb0..bdeb5c21 100644
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-beta1-pre";
-  quasselDate = "2008-04-14";
-  quasselBuild = 745;
+  quasselDate = "2008-04-15";
+  quasselBuild = 747;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;