projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tray icon behavior for non-KDE StatusNotifier
[quassel.git]
/
src
/
qtui
/
chatmonitorfilter.cpp
diff --git
a/src/qtui/chatmonitorfilter.cpp
b/src/qtui/chatmonitorfilter.cpp
index
055ed93
..
b46dd29
100644
(file)
--- a/
src/qtui/chatmonitorfilter.cpp
+++ b/
src/qtui/chatmonitorfilter.cpp
@@
-64,22
+64,23
@@
bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
if(!(type & (Message::Plain | Message::Notice | Message::Action)))
return false;
if(!(type & (Message::Plain | Message::Notice | Message::Action)))
return false;
+ BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value<BufferId>();
+
// ChatMonitorSettingsPage
if(_operationMode == ChatViewSettings::OptOut
&& !(_showHighlights && flags & Message::Highlight)
// ChatMonitorSettingsPage
if(_operationMode == ChatViewSettings::OptOut
&& !(_showHighlights && flags & Message::Highlight)
- && _bufferIds.contains(
source_index.data(MessageModel::BufferIdRole).value<BufferId>()
))
+ && _bufferIds.contains(
bufferId
))
return false;
if(_operationMode == ChatViewSettings::OptIn
&& !(_showHighlights && flags & Message::Highlight)
return false;
if(_operationMode == ChatViewSettings::OptIn
&& !(_showHighlights && flags & Message::Highlight)
- && !_bufferIds.contains(
source_index.data(MessageModel::BufferIdRole).value<BufferId>()
))
+ && !_bufferIds.contains(
bufferId
))
return false;
// ignorelist handling
return false;
// ignorelist handling
- const MessageModelItem *item = const_cast<const MessageModel*>(static_cast<MessageModel*>(sourceModel()))->messageItemAt(sourceRow);
// only match if message is not flagged as server msg
// only match if message is not flagged as server msg
- if(!(
item->message().flags() & Message::ServerMsg) &&
-
Client::ignoreListManager()->match(item->message(), Client::networkModel()->networkName(item->bufferId()
)))
-
return false;
+ if(!(
flags & Message::ServerMsg) && Client::ignoreListManager()
+
&& Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId
)))
+ return false;
return true;
}
return true;
}
@@
-164,5
+165,5
@@
void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) {
foreach (QVariant v, newValue.toList()) {
_bufferIds << v.value<BufferId>();
}
foreach (QVariant v, newValue.toList()) {
_bufferIds << v.value<BufferId>();
}
- invalidate();
+ invalidate
Filter
();
}
}