X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=c6fa1e79ac8717720e727c389f890f4eabaa0479;hp=816227fad658693f4ffce28daa1240db3f8b936e;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=1658ab9a8f4287fde15f3ceb13503282a6948990

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 816227fa..c6fa1e79 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -65,12 +65,14 @@ void BufferSyncer::initSetLastSeenMsg(const QVariantList &list) {
 }
 
 void BufferSyncer::removeBuffer(BufferId buffer) {
-  if(_lastSeenMsg.contains(buffer)) {
+  if(_lastSeenMsg.contains(buffer))
     _lastSeenMsg.remove(buffer);
-    emit bufferRemoved(buffer);
-  }
+  emit bufferRemoved(buffer);
 }
 
-// void BufferSyncer::renameBuffer(BufferId buffer, QString newName) {
-//   emit bufferRenamed(buffer, newName);
-// }
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
+  if(_lastSeenMsg.contains(buffer2))
+    _lastSeenMsg.remove(buffer2);
+  emit buffersPermanentlyMerged(buffer1, buffer2);
+}