10 files changed, 54 insertions, 2 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 7918c46..c6ada7c 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -25,6 +25,7 @@
 #include "Swiften/Presence/SubscriptionManager.h"
 #include "Swiften/TLS/BlindCertificateTrustChecker.h"
 #include <Swiften/Client/NickManagerImpl.h>
+#include <Swiften/Client/ClientSession.h>
 
 namespace Swift {
 
@@ -35,7 +36,7 @@ Client::Client(const JID& jid, const std::string& password, NetworkFactories* ne
 	softwareVersionResponder->start();
 
 	roster = new XMPPRosterImpl();
-	rosterController = new XMPPRosterController(getIQRouter(), roster);
+	rosterController = new XMPPRosterController(getIQRouter(), roster, storages->getRosterStorage());
 
 	subscriptionManager = new SubscriptionManager(getStanzaChannel());
 
@@ -98,6 +99,11 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
 }
 
 void Client::requestRoster() {
+	// FIXME: We should set this once when the session is finished, but there
+	// is currently no callback for this
+	if (getSession()) {
+		rosterController->setUseVersioning(getSession()->getRosterVersioningSupported());
+	}
 	rosterController->requestRoster();
 }
 
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index e1c1d8e..cadc9a4 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -54,6 +54,7 @@ ClientSession::ClientSession(
 			needSessionStart(false),
 			needResourceBind(false),
 			needAcking(false),
+			rosterVersioningSupported(false),
 			authenticator(NULL),
 			certificateTrustChecker(NULL) {
 }
@@ -223,6 +224,7 @@ void ClientSession::handleElement(boost::shared_ptr<Element> element) {
 		}
 		else {
 			// Start the session
+			rosterVersioningSupported = streamFeatures->hasRosterVersioning();
 			stream->setWhitespacePingEnabled(true);
 			needSessionStart = streamFeatures->hasSession();
 			needResourceBind = streamFeatures->hasResourceBind();
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 25ee694..4447f57 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -89,6 +89,10 @@ namespace Swift {
 				return stanzaAckRequester_;
 			}
 
+			bool getRosterVersioningSupported() const {
+				return rosterVersioningSupported;
+			}
+
 			const JID& getLocalJID() const {
 				return localJID;
 			}
@@ -153,6 +157,7 @@ namespace Swift {
 			bool needSessionStart;
 			bool needResourceBind;
 			bool needAcking;
+			bool rosterVersioningSupported;
 			ClientAuthenticator* authenticator;
 			boost::shared_ptr<StanzaAckRequester> stanzaAckRequester_;
 			boost::shared_ptr<StanzaAckResponder> stanzaAckResponder_;
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 060c699..ceb0b0a 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -196,6 +196,11 @@ namespace Swift {
 			 */
 			boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaAcked;
 
+		protected:
+			boost::shared_ptr<ClientSession> getSession() const {
+				return session_;
+			}
+
 		private:
 			void handleConnectorFinished(boost::shared_ptr<Connection>);
 			void handleStanzaChannelAvailableChanged(bool available);
diff --git a/Swiften/Client/FileStorages.cpp b/Swiften/Client/FileStorages.cpp
index 3c76c46..e6a93fd 100644
--- a/Swiften/Client/FileStorages.cpp
+++ b/Swiften/Client/FileStorages.cpp
@@ -8,6 +8,7 @@
 #include "Swiften/VCards/VCardFileStorage.h"
 #include "Swiften/Avatars/AvatarFileStorage.h"
 #include "Swiften/Disco/CapsFileStorage.h"
+#include "Swiften/Roster/RosterFileStorage.h"
 
 namespace Swift {
 
@@ -16,9 +17,11 @@ FileStorages::FileStorages(const boost::filesystem::path& baseDir, const JID& ji
 	vcardStorage = new VCardFileStorage(baseDir / profile / "vcards");
 	capsStorage = new CapsFileStorage(baseDir / "caps");
 	avatarStorage = new AvatarFileStorage(baseDir / "avatars", baseDir / profile / "avatars");
+	rosterStorage = new RosterFileStorage(baseDir / profile / "roster.xml");
 }
 
 FileStorages::~FileStorages() {
+	delete rosterStorage;
 	delete avatarStorage;
 	delete capsStorage;
 	delete vcardStorage;
@@ -36,4 +39,8 @@ AvatarStorage* FileStorages::getAvatarStorage() const {
 	return avatarStorage;
 }
 
+RosterStorage* FileStorages::getRosterStorage() const {
+	return rosterStorage;
+}
+
 }
diff --git a/Swiften/Client/FileStorages.h b/Swiften/Client/FileStorages.h
index fc05c86..28df314 100644
--- a/Swiften/Client/FileStorages.h
+++ b/Swiften/Client/FileStorages.h
@@ -14,6 +14,7 @@ namespace Swift {
 	class VCardFileStorage;
 	class AvatarFileStorage;
 	class CapsFileStorage;
+	class RosterFileStorage;
 	class JID;
 
 	/**
@@ -41,10 +42,12 @@ namespace Swift {
 			virtual VCardStorage* getVCardStorage() const;
 			virtual AvatarStorage* getAvatarStorage() const;
 			virtual CapsStorage* getCapsStorage() const;
+			virtual RosterStorage* getRosterStorage() const;
 
 		private:
 			VCardFileStorage* vcardStorage;
 			AvatarFileStorage* avatarStorage;
 			CapsFileStorage* capsStorage;
+			RosterFileStorage* rosterStorage;
 	};
 }
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index 5f6371b..6941add 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -8,6 +8,7 @@
 #include "Swiften/VCards/VCardMemoryStorage.h"
 #include "Swiften/Avatars/AvatarMemoryStorage.h"
 #include "Swiften/Disco/CapsMemoryStorage.h"
+#include "Swiften/Roster/RosterMemoryStorage.h"
 
 namespace Swift {
 
@@ -15,9 +16,11 @@ MemoryStorages::MemoryStorages() {
 	vcardStorage = new VCardMemoryStorage();
 	capsStorage = new CapsMemoryStorage();
 	avatarStorage = new AvatarMemoryStorage();
+	rosterStorage = new RosterMemoryStorage();
 }
 
 MemoryStorages::~MemoryStorages() {
+	delete rosterStorage;
 	delete avatarStorage;
 	delete capsStorage;
 	delete vcardStorage;
@@ -35,4 +38,9 @@ AvatarStorage* MemoryStorages::getAvatarStorage() const {
 	return avatarStorage;
 }
 
+RosterStorage* MemoryStorages::getRosterStorage() const {
+	return rosterStorage;
+}
+
+
 }
diff --git a/Swiften/Client/MemoryStorages.h b/Swiften/Client/MemoryStorages.h
index 67025cd..1e1a596 100644
--- a/Swiften/Client/MemoryStorages.h
+++ b/Swiften/Client/MemoryStorages.h
@@ -23,10 +23,12 @@ namespace Swift {
 			virtual VCardStorage* getVCardStorage() const;
 			virtual AvatarStorage* getAvatarStorage() const;
 			virtual CapsStorage* getCapsStorage() const;
+			virtual RosterStorage* getRosterStorage() const;
 
 		private:
 			VCardMemoryStorage* vcardStorage;
 			AvatarStorage* avatarStorage;
 			CapsStorage* capsStorage;
+			RosterStorage* rosterStorage;
 	};
 }
diff --git a/Swiften/Client/Storages.cpp b/Swiften/Client/Storages.cpp
new file mode 100644
index 0000000..3c2dbc5
--- /dev/null
+++ b/Swiften/Client/Storages.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/Client/Storages.h>
+
+using namespace Swift;
+
+Storages::~Storages() {
+}
diff --git a/Swiften/Client/Storages.h b/Swiften/Client/Storages.h
index e62f0a9..1c5bbe9 100644
--- a/Swiften/Client/Storages.h
+++ b/Swiften/Client/Storages.h
@@ -10,6 +10,7 @@ namespace Swift {
 	class VCardStorage;
 	class AvatarStorage;
 	class CapsStorage;
+	class RosterStorage;
 
 	/**
 	 * An interface to hold storage classes for different
@@ -17,10 +18,11 @@ namespace Swift {
 	 */
 	class Storages {
 		public:
-			virtual ~Storages() {}
+			virtual ~Storages();
 
 			virtual VCardStorage* getVCardStorage() const = 0;
 			virtual AvatarStorage* getAvatarStorage() const = 0;
 			virtual CapsStorage* getCapsStorage() const = 0;
+			virtual RosterStorage* getRosterStorage() const = 0;
 	};
 }