X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebuffersyncer.cpp;h=2334e9dc2fe2227d21c60c3e4e58c27e801403de;hp=f218508f2d20799af916a58c1dcc4e50f072b9d9;hb=558260f52de5a9b1364f5672ace17554efc10a74;hpb=3c2914faeb01f3bc32e29f40179ae88040fbcf59 diff --git a/src/core/corebuffersyncer.cpp b/src/core/corebuffersyncer.cpp index f218508f..2334e9dc 100644 --- a/src/core/corebuffersyncer.cpp +++ b/src/core/corebuffersyncer.cpp @@ -26,7 +26,7 @@ #include "ircchannel.h" CoreBufferSyncer::CoreBufferSyncer(CoreSession *parent) - : BufferSyncer(parent), + : BufferSyncer(Core::bufferLastSeenMsgIds(parent->user()), parent), _coreSession(parent) { } @@ -94,7 +94,6 @@ void CoreBufferSyncer::renameBuffer(BufferId bufferId, QString newName) { void CoreBufferSyncer::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2) { BufferInfo bufferInfo1 = Core::getBufferInfo(_coreSession->user(), bufferId1); BufferInfo bufferInfo2 = Core::getBufferInfo(_coreSession->user(), bufferId2); - qDebug() << Q_FUNC_INFO << bufferInfo1 << bufferInfo2; if(!bufferInfo1.isValid() || !bufferInfo2.isValid()) { qWarning() << "CoreBufferSyncer::mergeBufferPermanently(): invalid BufferIds:" << bufferId1 << bufferId2 << "for User:" << _coreSession->user(); return; @@ -106,7 +105,6 @@ void CoreBufferSyncer::mergeBuffersPermanently(BufferId bufferId1, BufferId buff } if(Core::mergeBuffersPermanently(_coreSession->user(), bufferId1, bufferId2)) { - qDebug () << "HUUUUP"; BufferSyncer::mergeBuffersPermanently(bufferId1, bufferId2); } }