From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 27 Aug 2017 00:46:52 +0000 (+0200)
Subject: Clarified minor details, again
X-Git-Tag: travis-deploy-test~243
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7fccb74ec00f505d3a5485ad9592c37248c1e8c6

Clarified minor details, again
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 0558a7e9..1f8306d6 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -293,7 +293,12 @@ void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level)
 
 void BufferItem::clearActivityLevel()
 {
-    _activity = BufferInfo::NoActivity;
+    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        // If the core handles activity sync, clear only the highlight flag
+        _activity &= ~BufferInfo::Highlight;
+    } else {
+        _activity = BufferInfo::NoActivity;
+    }
     _firstUnreadMsgId = MsgId();
 
     // FIXME remove with core proto v11
diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index ca9c101d..0651d704 100644
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -126,9 +126,7 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId)
 
     _currentBuffer = bufferId;
     showChatView(bufferId);
-    if (!Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
-        Client::networkModel()->clearBufferActivity(bufferId);
-    }
+    Client::networkModel()->clearBufferActivity(bufferId);
     Client::setBufferLastSeenMsg(bufferId, _chatViews[bufferId]->lastMsgId());
     Client::backlogManager()->checkForBacklog(bufferId);
     setFocus();