projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added "join channel" to network context menu in the bufferview (bug 122)
[quassel.git]
/
src
/
client
/
buffer.cpp
diff --git
a/src/client/buffer.cpp
b/src/client/buffer.cpp
index
e94cf55
..
daa338a
100644
(file)
--- a/
src/client/buffer.cpp
+++ b/
src/client/buffer.cpp
@@
-54,6
+54,10
@@
void Buffer::appendMsg(const Message &msg) {
}
void Buffer::prependMsg(const Message &msg) {
}
void Buffer::prependMsg(const Message &msg) {
+ // check for duplicate first
+ if(contents().count() > 0 && msg.msgId() >= contents().first()->msgId()) {
+ return;
+ }
updateActivityLevel(msg);
layoutQueue.append(msg);
}
updateActivityLevel(msg);
layoutQueue.append(msg);
}
@@
-74,10
+78,10
@@
void Buffer::setVisible(bool visible) {
setLastSeen(layoutedMsgs.last()->timestamp());
}
setLastSeen(layoutedMsgs.last()->timestamp());
}
-void Buffer::setLastSeen(const QDateTime &seen) {
+void Buffer::setLastSeen(const QDateTime &seen) {
// qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
if(!lastSeen().isValid() || seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
_lastSeen = seen;
if(!lastSeen().isValid() || seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
_lastSeen = seen;
- Client::
bufferSyncer()->requestSet
LastSeen(bufferInfo().bufferId(), seen);
+ Client::
setBuffer
LastSeen(bufferInfo().bufferId(), seen);
//qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
setActivityLevel(NoActivity);
}
//qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
setActivityLevel(NoActivity);
}