fixed BR #129 (backlog messages not being checked for highlights)

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index e276cd8..7d4aeff 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -23,6 +23,7 @@
 #include "bufferinfo.h"
 #include "buffersyncer.h"
 #include "clientbacklogmanager.h"
+#include "bufferviewmanager.h"
 #include "global.h"
 #include "identity.h"
 #include "ircchannel.h"
@@ -66,6 +67,7 @@ Client::Client(QObject *parent)
     _bufferModel(0),
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
+    _bufferViewManager(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {
@@ -307,6 +309,9 @@ void Client::setSyncedToCore() {
 
   // attach backlog manager
   signalProxy()->synchronize(backlogManager());
+
+  // create a new BufferViewManager
+  _bufferViewManager = new BufferViewManager(signalProxy(), this);
   
   _syncedToCore = true;
   emit connected();
@@ -332,6 +337,12 @@ void Client::disconnectFromCore() {
     _bufferSyncer->deleteLater();
     _bufferSyncer = 0;
   }
+
+  if(_bufferViewManager) {
+    _bufferViewManager->deleteLater();
+    _bufferViewManager = 0;
+  }
+  
   _networkModel->clear();
 
   QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
@@ -475,6 +486,8 @@ void Client::recvMessage(const Message &message) {
     Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
     monitorBuffer()->appendMsg(mmsg);
   }
+
+  emit messageReceived(msg);
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
@@ -496,6 +509,7 @@ void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
   Message msg;
   while(msgIter != msgIterEnd) {
     msg = (*msgIter).value<Message>();
+    checkForHighlight(msg);
     buffer_->prependMsg(msg);
     msgIter++;
   }