From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 19 Dec 2017 18:17:22 +0000 (+0100)
Subject: Initialize new buffers in the UI with their activity
X-Git-Tag: travis-deploy-test~231
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=78decd5f8d1a149fc0e62e01bd6b2886e0feadfe;ds=sidebyside

Initialize new buffers in the UI with their activity

- Make Client::bufferSyncer public
- Load activity in NetworkItem::bufferItem from BufferSyncer::activity
---

diff --git a/src/client/client.h b/src/client/client.h
index 127a07f8..23f7d327 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -125,6 +125,8 @@ public:
     static inline ClientTransferManager *transferManager() { return instance()->_transferManager; }
     static inline TransferModel *transferModel() { return instance()->_transferModel; }
 
+    static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
+
     static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }
     static inline CoreConnection *coreConnection() { return instance()->_coreConnection; }
     static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); }
@@ -238,7 +240,6 @@ private:
     void requestInitialBacklog();
 
     static void addNetwork(Network *);
-    static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
     static QPointer<Client> instanceptr;
 
diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 1a239a8b..147605c7 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -34,6 +34,7 @@
 #include "ircchannel.h"
 #include "network.h"
 #include "signalproxy.h"
+#include "buffersyncer.h"
 
 /*****************************************
 *  Network Items
@@ -145,6 +146,10 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo)
         break;
     }
 
+    BufferSyncer *bufferSyncer = Client::bufferSyncer();
+    if (bufferSyncer)
+        bufferItem->addActivity(bufferSyncer->activity(bufferItem->bufferId()), false);
+
     return bufferItem;
 }