1 files changed, 18 insertions, 3 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index fe171f7..850c1b2 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -10,12 +10,18 @@
 #include <Swiften/Disco/CapsMemoryStorage.h>
 #include <Swiften/Roster/RosterMemoryStorage.h>
+#include <Swiften/History/SQLiteHistoryStorage.h>
 
 namespace Swift {
 
-MemoryStorages::MemoryStorages() {
-	vcardStorage = new VCardMemoryStorage();
+MemoryStorages::MemoryStorages(CryptoProvider* crypto) {
+	vcardStorage = new VCardMemoryStorage(crypto);
 	capsStorage = new CapsMemoryStorage();
 	avatarStorage = new AvatarMemoryStorage();
 	rosterStorage = new RosterMemoryStorage();
+#ifdef SWIFT_EXPERIMENTAL_HISTORY
+	historyStorage = new SQLiteHistoryStorage(":memory:");
+#else
+	historyStorage = NULL;
+#endif
 }
 
@@ -25,4 +31,5 @@ MemoryStorages::~MemoryStorages() {
 	delete capsStorage;
 	delete vcardStorage;
+	delete historyStorage;
 }
 
@@ -43,4 +50,12 @@ RosterStorage* MemoryStorages::getRosterStorage() const {
 }
 
+HistoryStorage* MemoryStorages::getHistoryStorage() const {
+#ifdef SWIFT_EXPERIMENTAL_HISTORY
+	return historyStorage;
+#else
+	return NULL;
+#endif
+}
+
 
 }