X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=f44c87d7cc213d434a502c665cb0d77a45cef263;hp=8feb777a006e383125c3865d1ca24103083386f7;hb=9da8a8a14a39bffe74403001978a13cc8b130138;hpb=7c74d84b7684b2e7d96736a1122184c2ce19fcc7 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 8feb777a..f44c87d7 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -108,7 +108,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { newChild(bufferItem); - // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own + // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own switch(bufferInfo.type()) { case BufferInfo::ChannelBuffer: { @@ -235,7 +235,7 @@ void BufferItem::clearActivityLevel() { _firstUnreadMsgId = MsgId(); // FIXME remove with core proto v11 - if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) { + if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) { _markerLineMsgId = _lastSeenMsgId; } @@ -319,7 +319,7 @@ void BufferItem::setLastSeenMsgId(MsgId msgId) { _lastSeenMsgId = msgId; // FIXME remove with core protocol v11 - if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) { + if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) { if(!isCurrentBuffer()) _markerLineMsgId = msgId; } @@ -1022,6 +1022,7 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId return; } bufferItem->setLastSeenMsgId(msgId); + emit lastSeenMsgSet(bufferId, msgId); } void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) { @@ -1032,6 +1033,7 @@ void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msg return; } bufferItem->setMarkerLineMsgId(msgId); + emit markerLineSet(bufferId, msgId); } void NetworkModel::updateBufferActivity(Message &msg) { @@ -1087,7 +1089,7 @@ void NetworkModel::updateBufferActivity(BufferItem *bufferItem, const Message &m bufferItem->updateActivityLevel(msg); if(bufferItem->isCurrentBuffer()) - emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId()); + emit requestSetLastSeenMsg(bufferItem->bufferId(), msg.msgId()); } void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {