projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check if the notifications client supports actions
[quassel.git]
/
src
/
client
/
clientbacklogmanager.cpp
diff --git
a/src/client/clientbacklogmanager.cpp
b/src/client/clientbacklogmanager.cpp
index
0a02e4e
..
8b6e2e4
100644
(file)
--- a/
src/client/clientbacklogmanager.cpp
+++ b/
src/client/clientbacklogmanager.cpp
@@
-29,9
+29,11
@@
#include <QDebug>
#include <QDebug>
+INIT_SYNCABLE_OBJECT(ClientBacklogManager)
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
- _requester(0)
+ _requester(0),
+ _initBacklogRequested(false)
{
}
{
}
@@
-78,7
+80,8
@@
void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit,
}
void ClientBacklogManager::requestInitialBacklog() {
}
void ClientBacklogManager::requestInitialBacklog() {
- if(_requester && !_buffersRequested.isEmpty()) {
+ if(_initBacklogRequested) {
+ Q_ASSERT(_requester);
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
@@
-97,6
+100,7
@@
void ClientBacklogManager::requestInitialBacklog() {
};
_requester->requestInitialBacklog();
};
_requester->requestInitialBacklog();
+ _initBacklogRequested = true;
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
@@
-114,9
+118,14
@@
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &buffer
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
+ // we ingore all backlogrequests until we had our initial request
+ if(!_initBacklogRequested) {
+ return;
+ }
+
if(!_requester) {
// during client start up this message is to be expected in some situations.
if(!_requester) {
// during client start up this message is to be expected in some situations.
- qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester
(yet?)
.";
+ qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester.";
return;
}
switch(_requester->type()) {
return;
}
switch(_requester->type()) {
@@
-155,5
+164,6
@@
void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool so
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
+ _initBacklogRequested = false;
_buffersRequested.clear();
}
_buffersRequested.clear();
}