projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed highlighting of buffers caused by ignored messages.
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
f44c87d
..
c25fda6
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-26,6
+26,7
@@
#include "buffermodel.h"
#include "buffersettings.h"
#include "client.h"
#include "buffermodel.h"
#include "buffersettings.h"
#include "client.h"
+#include "clientignorelistmanager.h"
#include "clientsettings.h"
#include "ircchannel.h"
#include "network.h"
#include "clientsettings.h"
#include "ircchannel.h"
#include "network.h"
@@
-250,6
+251,10
@@
void BufferItem::updateActivityLevel(const Message &msg) {
if(msg.flags() & Message::Self) // don't update activity for our own messages
return;
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;
if(msg.msgId() <= lastSeenMsgId())
return;
@@
-798,7
+803,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()) {
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()));
}
if(!_ircUser->awayMessage().isEmpty())
toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
}