From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 27 Aug 2017 00:15:32 +0000 (+0200)
Subject: Separate highlight handling
X-Git-Tag: travis-deploy-test~245
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8138f68a2a71aa064687a8ede55beef5aaac11fe

Separate highlight handling
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index f3896e58..8a3df60d 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -308,6 +308,11 @@ void BufferItem::clearActivityLevel()
 void BufferItem::updateActivityLevel(const Message &msg)
 {
     if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        if (msg.flags().testFlag(Message::Highlight)) {
+            if (addActivity(Message::Types(msg.type()), msg.flags().testFlag(Message::Highlight))) {
+                emit dataChanged();
+            }
+        }
         return;
     }
 
@@ -339,7 +344,7 @@ void BufferItem::updateActivityLevel(const Message &msg)
 void BufferItem::setActivity(Message::Types type, bool highlight) {
     BufferInfo::ActivityLevel oldLevel = activityLevel();
 
-    _activity = BufferInfo::Activity();
+    _activity &= BufferInfo::Highlight;
     addActivity(type, highlight);
 
     if (_activity != oldLevel) {