The BufferSyncer cache is now purged when an unknown bufferId is encountered.

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 41ceb1e..759afcf 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -21,13 +21,14 @@
 #include "client.h"
 
 #include "abstractmessageprocessor.h"
+#include "abstractui.h"
 #include "bufferinfo.h"
 #include "buffermodel.h"
 #include "buffersettings.h"
 #include "buffersyncer.h"
 #include "bufferviewconfig.h"
-#include "bufferviewmanager.h"
 #include "clientbacklogmanager.h"
+#include "clientbufferviewmanager.h"
 #include "clientirclisthelper.h"
 #include "clientidentity.h"
 #include "ircchannel.h"
@@ -37,7 +38,6 @@
 #include "network.h"
 #include "networkmodel.h"
 #include "quassel.h"
-#include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
 
@@ -297,13 +297,10 @@ void Client::setSyncedToCore() {
 
   // create a new BufferViewManager
   Q_ASSERT(!_bufferViewManager);
-  _bufferViewManager = new BufferViewManager(signalProxy(), this);
+  _bufferViewManager = new ClientBufferViewManager(signalProxy(), this);
   connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
   connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
 
-  createDefaultIdentity();
-  createDefaultNetworks();
-
   _syncedToCore = true;
   emit connected();
   emit coreConnectionStateChanged(true);
@@ -323,32 +320,6 @@ void Client::createDefaultBufferView() {
   }
 }
 
-void Client::createDefaultIdentity() {
-  if(_identities.isEmpty()) {
-    Identity identity;
-    identity.setToDefaults();
-    identity.setIdentityName(tr("Default Identity"));
-    createIdentity(identity);
-  }
-}
-
-void Client::createDefaultNetworks() {
-  if(_networks.isEmpty()) {
-    QStringList defaultNets = Network::presetNetworks(true);
-    foreach(QString net, defaultNets) {
-      NetworkInfo info = Network::networkInfoFromPreset(net);
-      if(info.networkName.isEmpty())
-        continue;
-      QStringList defaultChans = Network::presetDefaultChannels(net);
-      createNetwork(info, defaultChans);
-    }
-  }
-}
-
-void Client::setSecuredConnection() {
-  emit securedConnection();
-}
-
 void Client::disconnectFromCore() {
   if(!isConnected())
     return;
@@ -450,6 +421,12 @@ void Client::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2) {
   bufferSyncer()->requestMergeBuffersPermanently(bufferId1, bufferId2);
 }
 
+void Client::purgeKnownBufferIds() {
+  if(!bufferSyncer())
+    return;
+  bufferSyncer()->requestPurgeBufferIds();
+}
+
 void Client::bufferRemoved(BufferId bufferId) {
   // select a sane buffer (status buffer)
   /* we have to manually select a buffer because otherwise inconsitent changes