From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 16 Feb 2010 20:55:48 +0000 (+0100)
Subject: Properly set coreFeatures in the monolithic client
X-Git-Tag: 0.6-beta1~4
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6cdf52e028dda9e1f7f5627e21e440e21815e3ab

Properly set coreFeatures in the monolithic client
---

diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp
index f5239140..3bd59e0b 100644
--- a/src/client/coreconnection.cpp
+++ b/src/client/coreconnection.cpp
@@ -635,6 +635,9 @@ void CoreConnection::internalSessionStateReceived(const QVariant &packedState) {
 }
 
 void CoreConnection::syncToCore(const QVariantMap &sessionState) {
+  if(sessionState.contains("CoreFeatures"))
+    Client::setCoreFeatures((Quassel::Features)sessionState["CoreFeatures"].toUInt());
+
   setProgressText(tr("Receiving network states"));
   updateProgress(0, 100);
 
diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 355d867f..c515faed 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -293,6 +293,8 @@ void CoreSession::processMessages() {
 QVariant CoreSession::sessionState() {
   QVariantMap v;
 
+  v["CoreFeatures"] = (int)Quassel::features();
+
   QVariantList bufs;
   foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
   v["BufferInfos"] = bufs;