- Highlights are now determined in Client::checkForHighlight(Message &).

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

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 71b586e..52e5740 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -758,9 +758,8 @@ void NetworkModel::updateBufferActivity(const Message &msg) {
   if(msg.type() == Message::Plain || msg.type() == Message::Notice)
     level |= BufferItem::NewMessage;
 
-  const Network *net = Client::network(msg.bufferInfo().networkId());
-  if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick()))
-    level |= BufferItem::Highlight;
+  if(msg.flags() & Message::Highlight) 
+      level |= BufferItem::Highlight;
 
   bufferItem(msg.bufferInfo())->updateActivity(level);
 }