2 files changed, 7 insertions, 3 deletions
diff --git a/Swiften/StreamStack/XMPPLayer.cpp b/Swiften/StreamStack/XMPPLayer.cpp
index 59418a2..1f06b06 100644
--- a/Swiften/StreamStack/XMPPLayer.cpp
+++ b/Swiften/StreamStack/XMPPLayer.cpp
@@ -1,60 +1,62 @@
 /*
  * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/StreamStack/XMPPLayer.h>
 #include <Swiften/Parser/XMPPParser.h>
 #include <Swiften/Serializer/XMPPSerializer.h>
 #include <Swiften/Elements/ProtocolHeader.h>
 
 namespace Swift {
 
 XMPPLayer::XMPPLayer(
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		XMLParserFactory* xmlParserFactory,
-		StreamType streamType) :
+		StreamType streamType,
+		bool setExplictNSonTopLevelElements) :
 			payloadParserFactories_(payloadParserFactories), 
 			payloadSerializers_(payloadSerializers),
 			xmlParserFactory_(xmlParserFactory),
+			setExplictNSonTopLevelElements_(setExplictNSonTopLevelElements),
 			resetParserAfterParse_(false),
 			inParser_(false) {
 	xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory);
-	xmppSerializer_ = new XMPPSerializer(payloadSerializers_, streamType);
+	xmppSerializer_ = new XMPPSerializer(payloadSerializers_, streamType, setExplictNSonTopLevelElements);
 }
 
 XMPPLayer::~XMPPLayer() {
 	delete xmppSerializer_;
 	delete xmppParser_;
 }
 
 void XMPPLayer::writeHeader(const ProtocolHeader& header) {
 	writeDataInternal(createSafeByteArray(xmppSerializer_->serializeHeader(header)));
 }
 
 void XMPPLayer::writeFooter() {
 	writeDataInternal(createSafeByteArray(xmppSerializer_->serializeFooter()));
 }
 
 void XMPPLayer::writeElement(boost::shared_ptr<ToplevelElement> element) {
 	writeDataInternal(xmppSerializer_->serializeElement(element));
 }
 
 void XMPPLayer::writeData(const std::string& data) {
 	writeDataInternal(createSafeByteArray(data));
 }
 
 void XMPPLayer::writeDataInternal(const SafeByteArray& data) {
 	onWriteData(data);
 	writeDataToChildLayer(data);
 }
 
 void XMPPLayer::handleDataRead(const SafeByteArray& data) {
 	onDataRead(data);
 	inParser_ = true;
 	// FIXME: Converting to unsafe string. Should be ok, since we don't take passwords
 	// from the stream in clients. If servers start using this, and require safe storage,
 	// we need to fix this.
 	if (!xmppParser_->parse(byteArrayToString(ByteArray(data.begin(), data.end())))) {
diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h
index bb0e498..13266e4 100644
--- a/Swiften/StreamStack/XMPPLayer.h
+++ b/Swiften/StreamStack/XMPPLayer.h
@@ -1,73 +1,75 @@
 /*
  * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/noncopyable.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/StreamStack/HighLayer.h>
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/Elements/StreamType.h>
 #include <Swiften/Parser/XMPPParserClient.h>
 
 namespace Swift {
 	class ProtocolHeader;
 	class XMPPParser;
 	class PayloadParserFactoryCollection;
 	class XMPPSerializer;
 	class PayloadSerializerCollection;
 	class XMLParserFactory;
 	class BOSHSessionStream;
 
 	class SWIFTEN_API XMPPLayer : public XMPPParserClient, public HighLayer, boost::noncopyable {
 		friend class BOSHSessionStream;
 		public:
 			XMPPLayer(
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					XMLParserFactory* xmlParserFactory,
-					StreamType streamType);
+					StreamType streamType,
+					bool setExplictNSonTopLevelElements = false);
 			~XMPPLayer();
 
 			void writeHeader(const ProtocolHeader& header);
 			void writeFooter();
 			void writeElement(boost::shared_ptr<ToplevelElement>);
 			void writeData(const std::string& data);
 
 			void resetParser();
 
 		protected:
 			void handleDataRead(const SafeByteArray& data);
 			void writeDataInternal(const SafeByteArray& data);
 
 		public:
 			boost::signal<void (const ProtocolHeader&)> onStreamStart;
 			boost::signal<void (boost::shared_ptr<ToplevelElement>)> onElement;
 			boost::signal<void (const SafeByteArray&)> onWriteData;
 			boost::signal<void (const SafeByteArray&)> onDataRead;
 			boost::signal<void ()> onError;
 
 		private:
 			void handleStreamStart(const ProtocolHeader&);
 			void handleElement(boost::shared_ptr<ToplevelElement>);
 			void handleStreamEnd();
 
 			void doResetParser();
 
 		private:
 			PayloadParserFactoryCollection* payloadParserFactories_;
 			XMPPParser* xmppParser_;
 			PayloadSerializerCollection* payloadSerializers_;
 			XMLParserFactory* xmlParserFactory_;
 			XMPPSerializer* xmppSerializer_;
+			bool setExplictNSonTopLevelElements_;
 			bool resetParserAfterParse_;
 			bool inParser_;
 	};
 }