X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=d713d3306dc1a35678316a1e155e89f26657d5e4;hb=3456106b07bfc3000e50df9322ddefd4f872e0fb;hp=f44c87d7cc213d434a502c665cb0d77a45cef263;hpb=9da8a8a14a39bffe74403001978a13cc8b130138;p=quassel.git

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index f44c87d7..d713d330 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -21,11 +21,13 @@
 #include "networkmodel.h"
 
 #include <QAbstractItemView>
+#include <QMimeData>
 #include <QTextDocument> 	// for Qt::escape()
 
 #include "buffermodel.h"
 #include "buffersettings.h"
 #include "client.h"
+#include "clientignorelistmanager.h"
 #include "clientsettings.h"
 #include "ircchannel.h"
 #include "network.h"
@@ -250,6 +252,10 @@ void BufferItem::updateActivityLevel(const Message &msg) {
   if(msg.flags() & Message::Self)	// don't update activity for our own messages
     return;
 
+  if (Client::ignoreListManager()
+      && Client::ignoreListManager()->match(msg, qobject_cast<NetworkItem *>(parent())->networkName()))
+    return;
+
   if(msg.msgId() <= lastSeenMsgId())
     return;
 
@@ -798,7 +804,7 @@ QString IrcUserItem::toolTip(int column) const {
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
   if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
   if(_ircUser->isAway()) {
-    toolTip[0].append(" is away");
+    toolTip[0].append(tr(" is away"));
     if(!_ircUser->awayMessage().isEmpty())
       toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
   }