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 127a07f..23f7d32 100644 (file)
--- 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 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(); }
     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 *);
     void requestInitialBacklog();
 
     static void addNetwork(Network *);

-    static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }

 
     static QPointer<Client> instanceptr;
 
 
     static QPointer<Client> instanceptr;
 

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 1a239a8..147605c 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -34,6 +34,7 @@
 #include "ircchannel.h"
 #include "network.h"
 #include "signalproxy.h"
 #include "ircchannel.h"
 #include "network.h"
 #include "signalproxy.h"

+#include "buffersyncer.h"

 
 /*****************************************
 *  Network Items
 
 /*****************************************
 *  Network Items


@@ -145,6 +146,10 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo)
         break;
     }
 
         break;
     }
 

+    BufferSyncer *bufferSyncer = Client::bufferSyncer();
+    if (bufferSyncer)
+        bufferItem->addActivity(bufferSyncer->activity(bufferItem->bufferId()), false);
+

     return bufferItem;
 }
 
     return bufferItem;
 }