projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qa: Add [[fallthrough]] annotations where appropriate
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
a1bb73f
..
147605c
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-34,6
+34,7
@@
#include "ircchannel.h"
#include "network.h"
#include "signalproxy.h"
#include "ircchannel.h"
#include "network.h"
#include "signalproxy.h"
+#include "buffersyncer.h"
/*****************************************
* Network Items
/*****************************************
* Network Items
@@
-145,6
+146,10
@@
BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo)
break;
}
break;
}
+ BufferSyncer *bufferSyncer = Client::bufferSyncer();
+ if (bufferSyncer)
+ bufferItem->addActivity(bufferSyncer->activity(bufferItem->bufferId()), false);
+
return bufferItem;
}
return bufferItem;
}
@@
-339,7
+344,7
@@
void BufferItem::updateActivityLevel(const Message &msg)
Message::Types type;
// If the core handles activities, ignore types
Message::Types type;
// If the core handles activities, ignore types
- if (
!
Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+ if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
type = Message::Types();
} else {
type = msg.type();
type = Message::Types();
} else {
type = msg.type();
@@
-364,7
+369,7
@@
void BufferItem::setActivity(Message::Types type, bool highlight) {
bool BufferItem::addActivity(Message::Types type, bool highlight) {
auto oldActivity = activityLevel();
bool BufferItem::addActivity(Message::Types type, bool highlight) {
auto oldActivity = activityLevel();
- if (type !=
0
)
+ if (type !=
Message::Types()
)
_activity |= BufferInfo::OtherActivity;
if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))
_activity |= BufferInfo::OtherActivity;
if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))