X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=0401dca1da4833956f07f4eea8ad3a64dbad96d2;hp=076e7047e7836a4b9494ed72b81f7a4fff484c65;hb=8c38d6c5248c1b364bf56e25be0069f32c4f0408;hpb=2d19986a8bafafec55b5d3b0474f7d76eb5f33b2

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 076e7047..0401dca1 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -40,9 +40,9 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
     _activity(NoActivity)
 {
   // determine BufferType
-  if(bufferInfo.buffer().isEmpty())
+  if(bufferInfo.bufferName().isEmpty())
     _type = StatusType;
-  else if(isChannelName(bufferInfo.buffer()))
+  else if(isChannelName(bufferInfo.bufferName()))
     _type = ChannelType;
   else
     _type = QueryType;
@@ -59,7 +59,7 @@ const BufferInfo &BufferItem::bufferInfo() const {
 }
 
 quint64 BufferItem::id() const {
-  return bufferInfo().uid().toInt();
+  return bufferInfo().bufferId().toInt();
 }
 
 bool BufferItem::isStatusBuffer() const {
@@ -96,7 +96,7 @@ QVariant BufferItem::data(int column, int role) const {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
   case NetworkModel::BufferIdRole:
-    return qVariantFromValue(bufferInfo().uid());
+    return qVariantFromValue(bufferInfo().bufferId());
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
   case NetworkModel::BufferInfoRole:
@@ -163,7 +163,7 @@ QString BufferItem::bufferName() const {
   if(bufferType() == StatusType)
     return tr("Status Buffer");
   else
-    return bufferInfo().buffer();
+    return bufferInfo().bufferName();
 }
 
 QString BufferItem::topic() const {
@@ -578,7 +578,7 @@ QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
 }
 
 BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
@@ -705,9 +705,18 @@ void NetworkModel::updateBufferActivity(const Message &msg) {
   if(msg.type() == Message::Plain || msg.type() == Message::Notice)
     level |= BufferItem::NewMessage;
 
-  if(msg.flags() & Message::Highlight)
+  const Network *net = Client::network(msg.bufferInfo().networkId());
+  if(net && msg.text().contains(net->myNick()))
     level |= BufferItem::Highlight;
   
-  bufferItem(msg.buffer())->updateActivity(level);
+  bufferItem(msg.bufferInfo())->updateActivity(level);
 }
 
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+  QVariant netVariant = index.data(NetworkIdRole);
+  if(!netVariant.isValid())
+    return 0;
+
+  NetworkId networkId = netVariant.value<NetworkId>();
+  return Client::network(networkId);
+}