X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=c90e7f666de3c7980df45ca8cbe77720b0d2f787;hp=344f6a780dcd4e9d9cc855b890f414d24301615d;hb=1b113021e8d82f93f46e02cf66428aebfb7d0357;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 344f6a78..c90e7f66 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -68,7 +68,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
 
   p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
   p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
-  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &)));
   p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
 
   loadSettings();
@@ -182,7 +182,6 @@ void CoreSession::removeClient(QIODevice *iodev) {
 
 QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const {
   return Core::persistentChannels(user(), id);
-  return QHash<QString, QString>();
 }
 
 // FIXME switch to BufferId
@@ -307,7 +306,7 @@ void CoreSession::removeIdentity(IdentityId id) {
 
 /*** Network Handling ***/
 
-void CoreSession::createNetwork(const NetworkInfo &info_) {
+void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &persistentChans) {
   NetworkInfo info = info_;
   int id;
 
@@ -331,6 +330,11 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     _networks[id] = net;
     signalProxy()->synchronize(net);
     emit networkCreated(id);
+    // create persistent chans
+    foreach(QString channel, persistentChans) {
+      Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, channel, true);
+      Core::setChannelPersistent(user(), info.networkId, channel, true);
+    }
   } else {
     qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
     _networks[info.networkId]->requestSetNetworkInfo(info);