3 files changed, 17 insertions, 0 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index da497bc..f158370 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -15,4 +15,5 @@
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/MUC/MUCManager.h>
+#include <Swiften/PubSub/PubSubManagerImpl.h>
 #include <Swiften/Client/MemoryStorages.h>
 #include <Swiften/VCards/VCardManager.h>
@@ -77,7 +78,10 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 	whiteboardSessionManager = new WhiteboardSessionManager(getIQRouter(), getStanzaChannel(), presenceOracle, getEntityCapsProvider());
 #endif
+
+	pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter());
 }
 
 Client::~Client() {
+	delete pubsubManager;
 	delete whiteboardSessionManager;
 
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index f192539..9253074 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -39,4 +39,5 @@ namespace Swift {
 	class WhiteboardSessionManager;
 	class ClientBlockListManager;
+	class PubSubManager;
 
 	/**
@@ -160,4 +161,9 @@ namespace Swift {
 			WhiteboardSessionManager* getWhiteboardSessionManager() const;
 
+			PubSubManager* getPubSubManager() const {
+				return pubsubManager;
+			}
+
+		
 		public:
 			/**
@@ -196,4 +202,5 @@ namespace Swift {
 			WhiteboardSessionManager* whiteboardSessionManager;
 			ClientBlockListManager* blockListManager;
+			PubSubManager* pubsubManager;
 	};
 }
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
index d2b5446..b413f40 100644
--- a/Swiften/Client/ClientXMLTracer.cpp
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -10,8 +10,14 @@
 #include <boost/bind.hpp>
 
+#include <Swiften/Base/Platform.h>
+
 namespace Swift {
 
 ClientXMLTracer::ClientXMLTracer(CoreClient* client, bool bosh) : bosh(bosh) {
+#ifdef SWIFTEN_PLATFORM_WIN32
+	beautifier = new XMLBeautifier(true, false);
+#else
 	beautifier = new XMLBeautifier(true, true);
+#endif
 	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1));
 	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1));