adapting the backlogmanagers to the new storage api

[quassel.git] / src / client / backlogrequester.cpp

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index 8b4d374..40f574b 100644 (file)
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -22,6 +22,7 @@
 
 #include <QObject>
 
+#include "backlogsettings.h"
 #include "clientbacklogmanager.h"
 
 BacklogRequester::BacklogRequester(bool buffering, ClientBacklogManager *backlogManager)
@@ -41,9 +42,10 @@ bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
 //  FIXED BACKLOG REQUESTER
 // ========================================
 FixedBacklogRequester::FixedBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(true, backlogManager),
-    _backlogCount(500)
+  : BacklogRequester(true, backlogManager)
 {
+  BacklogSettings backlogSettings;
+  _backlogCount = backlogSettings.fixedBacklogAmount();
 }
 
 void FixedBacklogRequester::requestBacklog() {
@@ -51,6 +53,6 @@ void FixedBacklogRequester::requestBacklog() {
   setWaitingBuffers(allBuffers);
   backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 backlog messages for %2 buffers").arg(_backlogCount * allBuffers.count()).arg(allBuffers.count()));
   foreach(BufferId bufferId, allBuffers) {
-    backlogManager->requestBacklog(bufferId, _backlogCount, -1);
+    backlogManager->requestBacklog(bufferId, -1, -1, _backlogCount);
   }
 }