projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing dupe messages
[quassel.git]
/
src
/
client
/
backlogrequester.cpp
diff --git
a/src/client/backlogrequester.cpp
b/src/client/backlogrequester.cpp
index
8b53cf3
..
920e564
100644
(file)
--- a/
src/client/backlogrequester.cpp
+++ b/
src/client/backlogrequester.cpp
@@
-20,11
+20,12
@@
#include "backlogrequester.h"
#include "backlogrequester.h"
-#include <Q
Debug
>
+#include <Q
Object
>
-#include "backlogmanager.h"
+#include "backlogsettings.h"
+#include "clientbacklogmanager.h"
-BacklogRequester::BacklogRequester(bool buffering, BacklogManager *backlogManager)
+BacklogRequester::BacklogRequester(bool buffering,
Client
BacklogManager *backlogManager)
: backlogManager(backlogManager),
_isBuffering(buffering)
{
: backlogManager(backlogManager),
_isBuffering(buffering)
{
@@
-40,15
+41,17
@@
bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
// ========================================
// FIXED BACKLOG REQUESTER
// ========================================
// ========================================
// FIXED BACKLOG REQUESTER
// ========================================
-FixedBacklogRequester::FixedBacklogRequester(BacklogManager *backlogManager)
- : BacklogRequester(true, backlogManager),
- _backlogCount(500)
+FixedBacklogRequester::FixedBacklogRequester(ClientBacklogManager *backlogManager)
+ : BacklogRequester(true, backlogManager)
{
{
+ BacklogSettings backlogSettings;
+ _backlogCount = backlogSettings.fixedBacklogAmount();
}
void FixedBacklogRequester::requestBacklog() {
QList<BufferId> allBuffers = allBufferIds();
setWaitingBuffers(allBuffers);
}
void FixedBacklogRequester::requestBacklog() {
QList<BufferId> allBuffers = allBufferIds();
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);
}
foreach(BufferId bufferId, allBuffers) {
backlogManager->requestBacklog(bufferId, _backlogCount, -1);
}