X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=c90bcf6c436c4add57262179d491f8a149dde511;hp=24f1726c7e7598df19253d32b127c03bfaeb870c;hb=f3e117c216aaaf7c684326270e96876a608862ef;hpb=e9189ebd5af607385629d3aa74dc9fc15bb642f4

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 24f1726c..c90bcf6c 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -171,8 +171,10 @@ Buffer *Client::buffer(BufferInfo bufferInfo) {
     emit client->bufferUpdated(bufferInfo);
 
     // I don't like this: but currently there isn't really a prettier way:
-    QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId());
-    bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx));
+    if(isSynced()) {  // this slows down syncing a lot, so disable it during sync
+      QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId());
+      bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx));
+    }
   }
   Q_ASSERT(buff);
   return buff;
@@ -295,7 +297,7 @@ void Client::setSyncedToCore() {
   // create buffersyncer
   Q_ASSERT(!_bufferSyncer);
   _bufferSyncer = new BufferSyncer(this);
-  connect(bufferSyncer(), SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(updateLastSeen(BufferId, const QDateTime &)));
+  connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(updateLastSeenMsg(BufferId, MsgId)));
   connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
   connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
   signalProxy()->synchronize(bufferSyncer());
@@ -509,23 +511,24 @@ void Client::checkForHighlight(Message &msg) {
   const Network *net = network(msg.bufferInfo().networkId());
   if(net && !net->myNick().isEmpty()) {
     QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
-    if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text()))
+    if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self) && nickRegExp.exactMatch(msg.text()))
       msg.setFlags(msg.flags() | Message::Highlight);
   }
 }
 
-void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) {
+void Client::updateLastSeenMsg(BufferId id, const MsgId &msgId) {
   Buffer *b = buffer(id);
   if(!b) {
     qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
     return;
   }
-  b->setLastSeen(lastSeen);
+  b->setLastSeenMsg(msgId);
 }
 
-void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) {
-  if(!bufferSyncer()) return;
-  bufferSyncer()->requestSetLastSeen(id, lastSeen);
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
+  if(!bufferSyncer())
+    return;
+  bufferSyncer()->requestSetLastSeenMsg(id, msgId);
 }
 
 void Client::removeBuffer(BufferId id) {
@@ -534,18 +537,31 @@ void Client::removeBuffer(BufferId id) {
 }
 
 void Client::bufferRemoved(BufferId bufferId) {
+  // first remove the buffer from has. this prohibits further lastSeenUpdates
+  Buffer *buff = 0;
+  if(_buffers.contains(bufferId)) {
+    buff = _buffers.take(bufferId);
+    disconnect(buff, 0, this, 0);
+  }
+
+  // then we select a sane buffer (status buffer)
+  /* we have to manually select a buffer because otherwise inconsitent changes
+   * to the model might occur:
+   * the result of a buffer removal triggers a change in the selection model.
+   * the newly selected buffer might be a channel that hasn't been selected yet
+   * and a new nickview would be created (which never heard of the "rowsAboutToBeRemoved").
+   * this new view (and/or) its sort filter will then only receive a "rowsRemoved" signal.
+   */
   QModelIndex current = bufferModel()->currentIndex();
   if(current.data(NetworkModel::BufferIdRole).value<BufferId>() == bufferId) {
-    // select the status buffer if the currently displayed buffer is about to be removed
     bufferModel()->setCurrentIndex(current.sibling(0,0));
   }
-    
+
+  // and remove it from the model
   networkModel()->removeBuffer(bufferId);
-  if(_buffers.contains(bufferId)) {
-    Buffer *buff = _buffers.take(bufferId);
-    disconnect(buff, 0, this, 0);
+
+  if(buff)
     buff->deleteLater();
-  }
 }
 
 void Client::bufferRenamed(BufferId bufferId, const QString &newName) {