X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=945ac7da26079d11b6bd44cc817cfd0f22e5da23;hp=8dfaf0159fa70fdcf03145b67f3dc8bfb0e58826;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=af456476e906a564d9faf3381b8bc3111fdb2bbd

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 8dfaf015..945ac7da 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -370,7 +370,7 @@ void MessageModel::requestBacklog(BufferId bufferId) {
 						      .arg(requestCount)
 						      .arg(Client::networkModel()->networkName(bufferId))
 						      .arg(Client::networkModel()->bufferName(bufferId)));
-      Client::backlogManager()->requestBacklog(bufferId, requestCount, _messageList.at(i)->msgId().toInt());
+      Client::backlogManager()->requestBacklog(bufferId, -1, _messageList.at(i)->msgId(), requestCount);
       return;
     }
   }
@@ -385,6 +385,16 @@ void MessageModel::messagesReceived(BufferId bufferId, int count) {
     _messagesWaiting.remove(bufferId);
 }
 
+void MessageModel::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2) {
+  for(int i = 0; i < _messageList.count(); i++) {
+    if(_messageList[i]->bufferId() == bufferId2) {
+      _messageList[i]->setBufferId(bufferId1);
+      QModelIndex idx = index(i, 0);
+      emit dataChanged(idx, idx);
+    }
+  }
+}
+
 // ========================================
 //  MessageModelItem
 // ========================================
@@ -426,7 +436,6 @@ bool MessageModelItem::setData(int column, const QVariant &value, int role) {
   }
 }
 
-
 // Stuff for later
 bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
   return (*m1) < (*m2);