Improve marker line behavior; allow manual setting (Ctrl+R)

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 8feb777..f44c87d 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -108,7 +108,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
 
   newChild(bufferItem);
 
-  // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+  // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own
   switch(bufferInfo.type()) {
   case BufferInfo::ChannelBuffer:
     {
@@ -235,7 +235,7 @@ void BufferItem::clearActivityLevel() {
   _firstUnreadMsgId = MsgId();
 
   // FIXME remove with core proto v11
-  if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
     _markerLineMsgId = _lastSeenMsgId;
   }
 
@@ -319,7 +319,7 @@ void BufferItem::setLastSeenMsgId(MsgId msgId) {
   _lastSeenMsgId = msgId;
 
   // FIXME remove with core protocol v11
-  if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
     if(!isCurrentBuffer())
       _markerLineMsgId = msgId;
   }
@@ -1022,6 +1022,7 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId
     return;
   }
   bufferItem->setLastSeenMsgId(msgId);
+  emit lastSeenMsgSet(bufferId, msgId);
 }
 
 void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
@@ -1032,6 +1033,7 @@ void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msg
     return;
   }
   bufferItem->setMarkerLineMsgId(msgId);
+  emit markerLineSet(bufferId, msgId);
 }
 
 void NetworkModel::updateBufferActivity(Message &msg) {
@@ -1087,7 +1089,7 @@ void NetworkModel::updateBufferActivity(BufferItem *bufferItem, const Message &m
 
   bufferItem->updateActivityLevel(msg);
   if(bufferItem->isCurrentBuffer())
-    emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId());
+    emit requestSetLastSeenMsg(bufferItem->bufferId(), msg.msgId());
 }
 
 void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {