From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 2 Aug 2008 23:25:30 +0000 (+0200)
Subject: Bring back lastSeen support. Buffer has been hacked even closer to death now.
X-Git-Tag: 0.3.0~134
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e416a73af88ef581b262745feeea0add49779395

Bring back lastSeen support. Buffer has been hacked even closer to death now.
---

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index de3bfcf6..241e2e68 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -76,9 +76,11 @@ bool Buffer::layoutMsg() {
 void Buffer::setVisible(bool visible) {
   _isVisible = visible;
   setActivityLevel(NoActivity);
-  if(layoutedMsgs.isEmpty())
-    return;
-  setLastSeenMsg(layoutedMsgs.last()->msgId());
+  //if(layoutedMsgs.isEmpty())
+  //  return;
+  //setLastSeenMsg(layoutedMsgs.last()->msgId());
+  if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId());
+  //qDebug() << "setting last seen" << _lastRcvdMsg.msgId();
 }
 
 void Buffer::setLastSeenMsg(const MsgId &msgId) {
@@ -102,6 +104,10 @@ void Buffer::setActivityLevel(ActivityLevel level) {
 }
 
 void Buffer::updateActivityLevel(const Message &msg) {
+  // FIXME dirty hack to allow the lastSeen stuff to continue to work
+  //       will be made much nicer once Buffer dies, I hope...
+  if(msg.msgId() > _lastRcvdMsg.msgId()) _lastRcvdMsg = msg;
+
   if(isVisible())
     return;
 
diff --git a/src/client/buffer.h b/src/client/buffer.h
index 8a20f529..17e9b23c 100644
--- a/src/client/buffer.h
+++ b/src/client/buffer.h
@@ -73,6 +73,7 @@ private:
   BufferInfo _bufferInfo;
   bool _isVisible;
   MsgId _lastSeenMsg;
+  Message _lastRcvdMsg;
   ActivityLevel _activityLevel;
 
   QLinkedList<Message> layoutQueue;