18 files changed, 214 insertions, 184 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 7918c46..5a3450c 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, getStorages()->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/Client.h b/Swiften/Client/Client.h
index 083b8a0..05c1e6e 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Client/CoreClient.h"
+#include <Swiften/Client/CoreClient.h>
 
 namespace Swift {
 	class SoftwareVersionResponder;
@@ -85,12 +85,12 @@ namespace Swift {
 			/**
 			 * Returns the last received presence for the given (full) JID.
 			 */
-			Presence::ref getLastPresence(const JID& jid) const;
+			boost::shared_ptr<Presence> getLastPresence(const JID& jid) const;
 
 			/**
 			 * Returns the presence with the highest priority received for the given JID.
 			 */
-			Presence::ref getHighestPriorityPresence(const JID& bareJID) const;
+			boost::shared_ptr<Presence> getHighestPriorityPresence(const JID& bareJID) const;
 
 			PresenceOracle* getPresenceOracle() const {
 				return presenceOracle;
@@ -142,7 +142,7 @@ namespace Swift {
 			/**
 			 * This signal is emitted when a JID changes presence.
 			 */
-			boost::signal<void (Presence::ref)> onPresenceChange;
+			boost::signal<void (boost::shared_ptr<Presence>)> onPresenceChange;
 
 		private:
 			Storages* getStorages() const;
diff --git a/Swiften/Client/ClientOptions.h b/Swiften/Client/ClientOptions.h
new file mode 100644
index 0000000..1155b46
--- /dev/null
+++ b/Swiften/Client/ClientOptions.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+struct ClientOptions {
+	enum UseTLS {
+		NeverUseTLS,
+		UseTLSWhenAvailable
+	};
+
+	ClientOptions() : useStreamCompression(true), useTLS(UseTLSWhenAvailable), useStreamResumption(false) {
+	}
+
+	/**
+	 * Whether ZLib stream compression should be used when available.
+	 *
+	 * Default: true
+	 */
+	bool useStreamCompression;
+
+	/**
+	 * Sets whether TLS encryption should be used.
+	 *
+	 * Default: UseTLSWhenAvailable
+	 */
+	UseTLS useTLS;
+
+	/**
+	 * Use XEP-196 stream resumption when available.
+	 *
+	 * Default: false
+	 */
+	bool useStreamResumption;
+};
+
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/ClientSessionStanzaChannel.cpp b/Swiften/Client/ClientSessionStanzaChannel.cpp
index 6b32b3d..85d9dec 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.cpp
+++ b/Swiften/Client/ClientSessionStanzaChannel.cpp
@@ -7,6 +7,7 @@
 #include "Swiften/Client/ClientSessionStanzaChannel.h"
 
 #include <boost/bind.hpp>
+#include <iostream>
 
 namespace Swift {
 
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
new file mode 100644
index 0000000..a26ce66
--- /dev/null
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -0,0 +1,31 @@
+/*
+ * 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/ClientXMLTracer.h>
+
+#include <iostream>
+#include <boost/bind.hpp>
+
+namespace Swift {
+
+ClientXMLTracer::ClientXMLTracer(CoreClient* client) {
+	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, '<', _1));
+	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, '>', _1));
+}
+
+void ClientXMLTracer::printData(char direction, const std::string& data) {
+	printLine(direction);
+	std::cerr << data << std::endl;
+}
+
+void ClientXMLTracer::printLine(char c) {
+	for (unsigned int i = 0; i < 80; ++i) {
+		std::cerr << c;
+	}
+	std::cerr << std::endl;
+}
+
+}
diff --git a/Swiften/Client/ClientXMLTracer.h b/Swiften/Client/ClientXMLTracer.h
index bca2a54..617c53f 100644
--- a/Swiften/Client/ClientXMLTracer.h
+++ b/Swiften/Client/ClientXMLTracer.h
@@ -6,29 +6,15 @@
 
 #pragma once
 
-#include <boost/bind.hpp>
-
 #include <Swiften/Client/CoreClient.h>
 
 namespace Swift {
 	class ClientXMLTracer {
 		public:
-			ClientXMLTracer(CoreClient* client) {
-				client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, '<', _1));
-				client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, '>', _1));
-			}
+			ClientXMLTracer(CoreClient* client);
 
 		private:
-			static void printData(char direction, const std::string& data) {
-				printLine(direction);
-				std::cerr << data << std::endl;
-			}
-
-			static void printLine(char c) {
-				for (unsigned int i = 0; i < 80; ++i) {
-					std::cerr << c;
-				}
-				std::cerr << std::endl;
-			}
+			static void printData(char direction, const std::string& data);
+			static void printLine(char c);
 	};
 }
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index f0c5333..de40517 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -7,11 +7,12 @@
 #include "Swiften/Client/CoreClient.h"
 
 #include <boost/bind.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
 
 #include "Swiften/Client/ClientSession.h"
 #include "Swiften/TLS/PlatformTLSFactories.h"
 #include "Swiften/TLS/CertificateVerificationError.h"
-#include "Swiften/Network/Connector.h"
+#include <Swiften/Network/ChainedConnector.h>
 #include "Swiften/Network/NetworkFactories.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
 #include "Swiften/Session/BasicSessionStream.h"
@@ -19,10 +20,14 @@
 #include "Swiften/Base/IDGenerator.h"
 #include "Swiften/Client/ClientSessionStanzaChannel.h"
 #include <Swiften/Base/Log.h>
+#include <Swiften/Base/foreach.h>
+#include "Swiften/Network/PlatformProxyProvider.h"
+#include "Swiften/Network/SOCKS5ProxiedConnectionFactory.h"
+#include "Swiften/Network/HTTPConnectProxiedConnectionFactory.h"
 
 namespace Swift {
 
-CoreClient::CoreClient(const JID& jid, const std::string& password, NetworkFactories* networkFactories) : jid_(jid), password_(password), networkFactories(networkFactories), useStreamCompression(true), useTLS(UseTLSWhenAvailable), disconnectRequested_(false), certificateTrustChecker(NULL) {
+CoreClient::CoreClient(const JID& jid, const std::string& password, NetworkFactories* networkFactories) : jid_(jid), password_(password), networkFactories(networkFactories), disconnectRequested_(false), certificateTrustChecker(NULL) {
 	stanzaChannel_ = new ClientSessionStanzaChannel();
 	stanzaChannel_->onMessageReceived.connect(boost::bind(&CoreClient::handleMessageReceived, this, _1));
 	stanzaChannel_->onPresenceReceived.connect(boost::bind(&CoreClient::handlePresenceReceived, this, _1));
@@ -47,8 +52,9 @@ CoreClient::~CoreClient() {
 	delete stanzaChannel_;
 }
 
-void CoreClient::connect() {
+void CoreClient::connect(const ClientOptions& o) {
 	SWIFT_LOG(debug) << "Connecting" << std::endl;
+	options = o;
 	connect(jid_.getDomain());
 }
 
@@ -56,7 +62,19 @@ void CoreClient::connect(const std::string& host) {
 	SWIFT_LOG(debug) << "Connecting to host " << host << std::endl;
 	disconnectRequested_ = false;
 	assert(!connector_);
-	connector_ = Connector::create(host, networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory());
+
+	assert(proxyConnectionFactories.empty());
+	PlatformProxyProvider proxyProvider;
+	if(proxyProvider.getSOCKS5Proxy().isValid()) {
+		proxyConnectionFactories.push_back(new SOCKS5ProxiedConnectionFactory(networkFactories->getConnectionFactory(), proxyProvider.getSOCKS5Proxy()));
+	}
+	if(proxyProvider.getHTTPConnectProxy().isValid()) {
+		proxyConnectionFactories.push_back(new HTTPConnectProxiedConnectionFactory(networkFactories->getConnectionFactory(), proxyProvider.getHTTPConnectProxy()));
+	}
+	std::vector<ConnectionFactory*> connectionFactories(proxyConnectionFactories);
+	connectionFactories.push_back(networkFactories->getConnectionFactory());
+
+	connector_ = boost::make_shared<ChainedConnector>(host, networkFactories->getDomainNameResolver(), connectionFactories, networkFactories->getTimerFactory());
 	connector_->onConnectFinished.connect(boost::bind(&CoreClient::handleConnectorFinished, this, _1));
 	connector_->setTimeoutMilliseconds(60*1000);
 	connector_->start();
@@ -65,6 +83,10 @@ void CoreClient::connect(const std::string& host) {
 void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connection) {
 	connector_->onConnectFinished.disconnect(boost::bind(&CoreClient::handleConnectorFinished, this, _1));
 	connector_.reset();
+	foreach(ConnectionFactory* f, proxyConnectionFactories) {
+		delete f;
+	}
+
 	if (!connection) {
 		onDisconnected(disconnectRequested_ ? boost::optional<ClientError>() : boost::optional<ClientError>(ClientError::ConnectionError));
 	}
@@ -82,12 +104,12 @@ void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connectio
 
 		session_ = ClientSession::create(jid_, sessionStream_);
 		session_->setCertificateTrustChecker(certificateTrustChecker);
-		session_->setUseStreamCompression(useStreamCompression);
-		switch(useTLS) {
-			case UseTLSWhenAvailable:
+		session_->setUseStreamCompression(options.useStreamCompression);
+		switch(options.useTLS) {
+			case ClientOptions::UseTLSWhenAvailable:
 				session_->setUseTLS(ClientSession::UseTLSWhenAvailable);
 				break;
-			case NeverUseTLS:
+			case ClientOptions::NeverUseTLS:
 				session_->setUseTLS(ClientSession::NeverUseTLS);
 				break;
 		}
@@ -275,13 +297,25 @@ void CoreClient::handleStanzaAcked(Stanza::ref stanza) {
 	onStanzaAcked(stanza);
 }
 
-void CoreClient::setUseStreamCompression(bool b) {
-	useStreamCompression = b;
+bool CoreClient::isAvailable() const {
+	return stanzaChannel_->isAvailable();
 }
 
-void CoreClient::setUseTLS(UseTLS b) {
-	useTLS = b;
+bool CoreClient::getStreamManagementEnabled() const {
+	return stanzaChannel_->getStreamManagementEnabled();
 }
 
+StanzaChannel* CoreClient::getStanzaChannel() const {
+	return stanzaChannel_;
+}
+
+const JID& CoreClient::getJID() const {
+	if (session_) {
+		return session_->getLocalJID();
+	}
+	else {
+		return jid_;
+	}
+}
 
 }
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index eb9c42c..7c46fe7 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -6,35 +6,33 @@
 
 #pragma once
 
-#include "Swiften/Base/boost_bsignals.h"
+#include <string>
 #include <boost/shared_ptr.hpp>
+#include <Swiften/Base/boost_bsignals.h>
 
-#include "Swiften/Network/PlatformDomainNameResolver.h"
-#include "Swiften/Network/Connector.h"
-#include "Swiften/Base/Error.h"
-#include "Swiften/Client/ClientSession.h"
-#include "Swiften/Client/ClientError.h"
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/Elements/Message.h"
-#include "Swiften/JID/JID.h"
-#include <string>
-#include "Swiften/Client/StanzaChannel.h"
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
-#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include <Swiften/Entity/Entity.h>
-
-#include "Swiften/Client/ClientSessionStanzaChannel.h"
+#include <Swiften/JID/JID.h>
+#include <Swiften/Client/ClientError.h>
+#include <Swiften/Client/ClientOptions.h>
 
 namespace Swift {
+	class ChainedConnector;
+	class Message;
+	class Presence;
+	class Error;
 	class IQRouter;
 	class TLSContextFactory;
 	class ConnectionFactory;
+	class Connection;
 	class TimerFactory;
 	class ClientSession;
+	class StanzaChannel;
+	class Stanza;
 	class BasicSessionStream;
 	class PlatformTLSFactories;
 	class CertificateTrustChecker;
 	class NetworkFactories;
+	class ClientSessionStanzaChannel;
 
 	/** 
 	 * The central class for communicating with an XMPP server.
@@ -48,11 +46,6 @@ namespace Swift {
 	 */
 	class CoreClient : public Entity {
 		public: 
-			enum UseTLS {
-				NeverUseTLS,
-				UseTLSWhenAvailable
-			};
-
 			/**
 			 * Constructs a client for the given JID with the given password.
 			 * The given eventLoop will be used to post events to.
@@ -68,7 +61,7 @@ namespace Swift {
 			 * After the connection is established, the client will set 
 			 * initialize the stream and authenticate.
 			 */
-			void connect();
+			void connect(const ClientOptions& = ClientOptions());
 
 			/**
 			 * Disconnects the client from the server.
@@ -80,12 +73,12 @@ namespace Swift {
 			/**
 			 * Sends a message.
 			 */
-			void sendMessage(Message::ref);
+			void sendMessage(boost::shared_ptr<Message>);
 
 			/**
 			 * Sends a presence stanza.
 			 */
-			void sendPresence(Presence::ref);
+			void sendPresence(boost::shared_ptr<Presence>);
 
 			/**
 			 * Sends raw, unchecked data.
@@ -103,9 +96,7 @@ namespace Swift {
 			 * Checks whether the client is connected to the server,
 			 * and stanzas can be sent.
 			 */
-			bool isAvailable() const {
-				return stanzaChannel_->isAvailable();
-			}
+			bool isAvailable() const;
 
 			/**
 			 * Checks whether the client is active.
@@ -118,14 +109,7 @@ namespace Swift {
 			 * Returns the JID of the client. 
 			 * After the session was initialized, this returns the bound JID.
 			 */
-			const JID& getJID() const {
-				if (session_) {
-					return session_->getLocalJID();
-				}
-				else {
-					return jid_;
-				}
-			}
+			const JID& getJID() const;
 
 			/**
 			 * Checks whether stream management is enabled.
@@ -135,13 +119,9 @@ namespace Swift {
 			 *
 			 * \see onStanzaAcked
 			 */
-			bool getStreamManagementEnabled() const {
-				return stanzaChannel_->getStreamManagementEnabled();
-			}
+			bool getStreamManagementEnabled() const;
 
-			StanzaChannel* getStanzaChannel() const {
-				return stanzaChannel_;
-			}
+			StanzaChannel* getStanzaChannel() const;
 
 			/**
 			 * Sets the certificate trust checker.
@@ -153,16 +133,6 @@ namespace Swift {
 			 */
 			void setCertificateTrustChecker(CertificateTrustChecker*);
 
-			/**
-			 * Sets whether ZLib stream compression should be used when available.
-			 */
-			void setUseStreamCompression(bool b);
-
-			/**
-			 * Sets whether TLS encryption should be used.
-			 */
-			void setUseTLS(UseTLS useTLS);
-
 		public:
 			/**
 			 * Emitted when the client was disconnected from the network.
@@ -197,12 +167,12 @@ namespace Swift {
 			/**
 			 * Emitted when a message is received.
 			 */
-			boost::signal<void (Message::ref)> onMessageReceived;
+			boost::signal<void (boost::shared_ptr<Message>)> onMessageReceived;
 
 			/**
 			 * Emitted when a presence stanza is received.
 			 */
-			boost::signal<void (Presence::ref) > onPresenceReceived;
+			boost::signal<void (boost::shared_ptr<Presence>) > onPresenceReceived;
 
 			/**
 			 * Emitted when the server acknowledges receipt of a
@@ -210,7 +180,12 @@ namespace Swift {
 			 *
 			 * \see getStreamManagementEnabled()
 			 */
-			boost::signal<void (Stanza::ref)> onStanzaAcked;
+			boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaAcked;
+
+		protected:
+			boost::shared_ptr<ClientSession> getSession() const {
+				return session_;
+			}
 
 		private:
 			void handleConnectorFinished(boost::shared_ptr<Connection>);
@@ -219,19 +194,19 @@ namespace Swift {
 			void handleNeedCredentials();
 			void handleDataRead(const std::string&);
 			void handleDataWritten(const std::string&);
-			void handlePresenceReceived(Presence::ref);
-			void handleMessageReceived(Message::ref);
-			void handleStanzaAcked(Stanza::ref);
+			void handlePresenceReceived(boost::shared_ptr<Presence>);
+			void handleMessageReceived(boost::shared_ptr<Message>);
+			void handleStanzaAcked(boost::shared_ptr<Stanza>);
 
 		private:
 			JID jid_;
 			std::string password_;
 			NetworkFactories* networkFactories;
-			bool useStreamCompression;
-			UseTLS useTLS;
 			ClientSessionStanzaChannel* stanzaChannel_;
 			IQRouter* iqRouter_;
-			Connector::ref connector_;
+			ClientOptions options;
+			boost::shared_ptr<ChainedConnector> connector_;
+			std::vector<ConnectionFactory*> proxyConnectionFactories;
 			PlatformTLSFactories* tlsFactories;
 			boost::shared_ptr<Connection> connection_;
 			boost::shared_ptr<BasicSessionStream> sessionStream_;
diff --git a/Swiften/Client/DummyStanzaChannel.h b/Swiften/Client/DummyStanzaChannel.h
index b9f05c3..306e2b4 100644
--- a/Swiften/Client/DummyStanzaChannel.h
+++ b/Swiften/Client/DummyStanzaChannel.h
@@ -56,6 +56,22 @@ namespace Swift {
 				return iqStanza && iqStanza->getType() == type && iqStanza->getTo() == jid && iqStanza->getPayload<T>();
 			}
 
+			bool isResultAtIndex(size_t index, const std::string& id) {
+				if (index >= sentStanzas.size()) {
+					return false;
+				}
+				boost::shared_ptr<IQ> iqStanza = boost::dynamic_pointer_cast<IQ>(sentStanzas[index]);
+				return iqStanza && iqStanza->getType() == IQ::Result && iqStanza->getID() == id;
+			}
+
+			bool isErrorAtIndex(size_t index, const std::string& id) {
+				if (index >= sentStanzas.size()) {
+					return false;
+				}
+				boost::shared_ptr<IQ> iqStanza = boost::dynamic_pointer_cast<IQ>(sentStanzas[index]);
+				return iqStanza && iqStanza->getType() == IQ::Error && iqStanza->getID() == id;
+			}
+
 			template<typename T> boost::shared_ptr<T> getStanzaAtIndex(size_t index) {
 				if (sentStanzas.size() <= index) {
 					return boost::shared_ptr<T>();
diff --git a/Swiften/Client/FileStorages.cpp b/Swiften/Client/FileStorages.cpp
deleted file mode 100644
index 3c76c46..0000000
--- a/Swiften/Client/FileStorages.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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/FileStorages.h"
-#include "Swiften/VCards/VCardFileStorage.h"
-#include "Swiften/Avatars/AvatarFileStorage.h"
-#include "Swiften/Disco/CapsFileStorage.h"
-
-namespace Swift {
-
-FileStorages::FileStorages(const boost::filesystem::path& baseDir, const JID& jid) {
-	std::string profile = jid.toBare();
-	vcardStorage = new VCardFileStorage(baseDir / profile / "vcards");
-	capsStorage = new CapsFileStorage(baseDir / "caps");
-	avatarStorage = new AvatarFileStorage(baseDir / "avatars", baseDir / profile / "avatars");
-}
-
-FileStorages::~FileStorages() {
-	delete avatarStorage;
-	delete capsStorage;
-	delete vcardStorage;
-}
-
-VCardStorage* FileStorages::getVCardStorage() const {
-	return vcardStorage;
-}
-
-CapsStorage* FileStorages::getCapsStorage() const {
-	return capsStorage;
-}
-
-AvatarStorage* FileStorages::getAvatarStorage() const {
-	return avatarStorage;
-}
-
-}
diff --git a/Swiften/Client/FileStorages.h b/Swiften/Client/FileStorages.h
deleted file mode 100644
index 451105f..0000000
--- a/Swiften/Client/FileStorages.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <boost/filesystem.hpp>
-
-#include "Swiften/Client/Storages.h"
-
-namespace Swift {
-	class VCardFileStorage;
-	class AvatarFileStorage;
-	class CapsFileStorage;
-	class JID;
-
-	/**
-	 * A storages implementation that stores all controller data on disk.
-	 */
-	class FileStorages : public Storages {
-		public:
-			/**
-			 * Creates the storages interface.
-			 *
-			 * All data will be stored relative to a base directory, and
-			 * for some controllers, in a subdirectory for the given profile.
-			 * The data is stored in the following places:
-			 * - Avatars: <basedir>/avatars
-			 * - VCards: <basedir>/<profile>/vcards
-			 * - Entity capabilities: <basedir>/caps
-			 *
-			 * \param baseDir the base dir to store data relative to
-			 * \param jid the subdir in which profile-specific data will be stored. 
-			 *   The bare JID will be used as the subdir name.
-			 */
-			FileStorages(const boost::filesystem::path& baseDir, const JID& jid);
-			~FileStorages();
-
-			virtual VCardStorage* getVCardStorage() const;
-			virtual AvatarStorage* getAvatarStorage() const;
-			virtual CapsStorage* getCapsStorage() const;
-
-		private:
-			VCardFileStorage* vcardStorage;
-			AvatarFileStorage* avatarStorage;
-			CapsFileStorage* capsStorage;
-	};
-}
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/NickResolver.h b/Swiften/Client/NickResolver.h
index 881362a..bf373fa 100644
--- a/Swiften/Client/NickResolver.h
+++ b/Swiften/Client/NickResolver.h
@@ -5,9 +5,9 @@
  */
 
 #include <map>
-#include <boost/signals.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/boost_bsignals.h>
 #include <string>
 #include "Swiften/JID/JID.h"
 #include "Swiften/Elements/VCard.h"
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;
 	};
 }