X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=362b523348dfeaf4d57317bb406fa46f46adc959;hp=ac3663dda85543010e0aef2a05de175bbc6ce244;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=7897b8623a42967511e31c68d5c102033a1dcdb9

diff --git a/src/client/client.h b/src/client/client.h
index ac3663dd..362b5233 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -114,6 +114,7 @@ public:
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
   static void renameBuffer(BufferId bufferId, const QString &newName);
+  static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
@@ -164,6 +165,7 @@ public slots:
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
   void disconnectedFromCore();