2 files changed, 11 insertions, 0 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 1b07b65..63cd89f 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -11,6 +11,7 @@
 #include "Swiften/Roster/XMPPRosterController.h"
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Presence/PresenceSender.h"
+#include "Swiften/MUC/MUCRegistry.h"
 
 namespace Swift {
 
@@ -26,9 +27,13 @@ Client::Client(const JID& jid, const String& password) : CoreClient(jid, passwor
 	presenceOracle->onPresenceSubscriptionRequest.connect(boost::ref(onPresenceSubscriptionRequest));
 
 	presenceSender = new PresenceSender(getStanzaChannel());
+
+	mucRegistry = new MUCRegistry();
 }
 
 Client::~Client() {
+	delete mucRegistry;
+
 	delete presenceSender;
 
 	delete presenceOracle;
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 590e040..2b4aa45 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -15,6 +15,7 @@ namespace Swift {
 	class XMPPRosterController;
 	class PresenceOracle;
 	class PresenceSender;
+	class MUCRegistry;
 
 	/**
 	 * Provides the core functionality for writing XMPP client software.
@@ -75,6 +76,10 @@ namespace Swift {
 				return presenceSender;
 			}
 
+			MUCRegistry* getMUCRegistry() const {
+				return mucRegistry;
+			}
+
 		public:
 			/**
 			 * This signal is emitted when a JID changes presence.
@@ -92,5 +97,6 @@ namespace Swift {
 			XMPPRosterController* rosterController;
 			PresenceOracle* presenceOracle;
 			PresenceSender* presenceSender;
+			MUCRegistry* mucRegistry;
 	};
 }