X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbacklogrequester.cpp;h=8b53cf32f632efcde5b6019ec521ebafad91a4f4;hp=c22b6b6db5811f82a21cc2c8a5b6e74da1beb5fd;hb=8f0946673bc3edc84b6f13e16cbe8ece912b4a3b;hpb=954b1a6f53da55f9713fb4e75a2fb46dae7d9df8

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index c22b6b6d..8b53cf32 100644
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -24,22 +24,32 @@
 
 #include "backlogmanager.h"
 
-BacklogRequester::BacklogRequester(BacklogManager *backlogManager)
-  : backlogManager(backlogManager)
+BacklogRequester::BacklogRequester(bool buffering, BacklogManager *backlogManager)
+  : backlogManager(backlogManager),
+    _isBuffering(buffering)
 {
   Q_ASSERT(backlogManager);
 }
 
-// FIXED BACKLOG REQUESTER
-const int FixedBacklogRequester::backlogCount(500);
+bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
+  _bufferedMessages << messages;
+  _buffersWaiting.remove(bufferId);
+  return !_buffersWaiting.isEmpty();
+}
 
+// ========================================
+//  FIXED BACKLOG REQUESTER
+// ========================================
 FixedBacklogRequester::FixedBacklogRequester(BacklogManager *backlogManager)
-  : BacklogRequester(backlogManager)
+  : BacklogRequester(true, backlogManager),
+    _backlogCount(500)
 {
 }
 
 void FixedBacklogRequester::requestBacklog() {
-  foreach(BufferId bufferId, allBufferIds()) {
-    backlogManager->requestBacklog(bufferId, backlogCount, -1);
+  QList<BufferId> allBuffers = allBufferIds();
+  setWaitingBuffers(allBuffers);
+  foreach(BufferId bufferId, allBuffers) {
+    backlogManager->requestBacklog(bufferId, _backlogCount, -1);
   }
 }