X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=1fc9846f9f0dad56df1816a2ece05c1ce5755408;hp=14de0d41c8545ec8708ff90c14a6ae42a740f2b4;hb=9f9d207ecf28dd5470ecef9d4076a3f447662a20;hpb=351e8bd985011abf721e2beffd9b8eeee74bf4e1 diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp index 14de0d41..1fc9846f 100644 --- a/src/client/buffer.cpp +++ b/src/client/buffer.cpp @@ -75,13 +75,16 @@ void Buffer::setVisible(bool visible) { _isVisible = visible; setActivityLevel(NoActivity); if(!layoutedMsgs.count()) return; - setLastSeen(layoutedMsgs.last()->timestamp()); + setLastSeenMsg(layoutedMsgs.last()->msgId()); } -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; - Client::setBufferLastSeen(bufferInfo().bufferId(), seen); +void Buffer::setLastSeenMsg(const MsgId &msgId) { + // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen(); + const MsgId oldLastSeen = lastSeenMsg(); + if(!oldLastSeen.isValid() || msgId.isValid() && msgId > oldLastSeen) { + //qDebug() << "setting:" << bufferInfo().bufferName() << seen; + _lastSeenMsg = msgId; + Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId); //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen(); setActivityLevel(NoActivity); } @@ -102,7 +105,7 @@ void Buffer::updateActivityLevel(const Message &msg) { if(msg.flags() & Message::Self) // don't update activity for our own messages return; - if(lastSeen().isValid() && lastSeen() >= msg.timestamp()) + if(lastSeenMsg().isValid() && lastSeenMsg() >= msg.msgId()) return; ActivityLevel level = activityLevel() | OtherActivity;