projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r800:803 from trunk to branches/0.3.
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
64092dd
..
a8cc7f9
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-505,8
+505,8
@@
void Client::recvMessage(const Message &message) {
#else
void Client::recvMessage(const Message &msg) {
#else
void Client::recvMessage(const Message &msg) {
-
-
+ //checkForHighlight(msg);
+ _messageModel->insertMessage(msg);
}
#endif /* SPUTDEV */
}
#endif /* SPUTDEV */
@@
-515,11
+515,20
@@
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
+#ifdef SPUTDEV
+void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+ //checkForHighlight(msg);
+ foreach(QVariant v, msgs) {
+ _messageModel->insertMessage(v.value<Message>());
+ }
+}
+
+#else
+
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
-#ifndef SPUTDEV
Buffer *buffer_ = buffer(bufferId);
if(!buffer_) {
Buffer *buffer_ = buffer(bufferId);
if(!buffer_) {
- qWarning() << "Client::rec
vBacklogData
(): received Backlog for unknown Buffer:" << bufferId;
+ qWarning() << "Client::rec
eiveBacklog
(): received Backlog for unknown Buffer:" << bufferId;
return;
}
return;
}
@@
-542,8
+551,8
@@
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
if(!layoutTimer->isActive()) {
layoutTimer->start();
}
if(!layoutTimer->isActive()) {
layoutTimer->start();
}
-#endif
}
}
+#endif /* SPUTDEV */
void Client::layoutMsg() {
if(layoutQueue.isEmpty()) {
void Client::layoutMsg() {
if(layoutQueue.isEmpty()) {
@@
-555,7
+564,7
@@
void Client::layoutMsg() {
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
return;
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
return;
- }
+ }
if(layoutQueue.isEmpty())
layoutTimer->stop();
if(layoutQueue.isEmpty())
layoutTimer->stop();