1 files changed, 23 insertions, 5 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 083b8a0..940a526 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -6,7 +6,9 @@
 
 #pragma once
 
-#include "Swiften/Client/CoreClient.h"
+#include <Swiften/Client/CoreClient.h>
+
+#include <Swiften/Base/SafeString.h>
 
 namespace Swift {
 	class SoftwareVersionResponder;
@@ -31,6 +33,9 @@ namespace Swift {
 	class SubscriptionManager;
 	class ClientDiscoManager;
 	class NickManager;
+	class FileTransferManager;
+	class JingleSessionManager;
+	class FileTransferManager;
 
 	/**
 	 * Provides the core functionality for writing XMPP client software.
@@ -47,7 +52,7 @@ namespace Swift {
 			 *	this is NULL,
 			 *	all data will be stored in memory (and be lost on shutdown)
 			 */
-			Client(const JID& jid, const std::string& password, NetworkFactories* networkFactories, Storages* storages = NULL);
+			Client(const JID& jid, const SafeString& password, NetworkFactories* networkFactories, Storages* storages = NULL);
 			~Client();
 
 
@@ -85,12 +90,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;
@@ -129,6 +134,14 @@ namespace Swift {
 			ClientDiscoManager* getDiscoManager() const {
 				return discoManager;
 			}
+			
+			/**
+			 * Returns a FileTransferManager for the client. This is only available after the onConnected 
+			 * signal has been fired.
+			 *
+			 * WARNING: File transfer will only work if Swiften is built in 'experimental' mode.
+			 */
+			FileTransferManager* getFileTransferManager() const;
 
 			/**
 			 * Configures the client to always trust a non-validating
@@ -142,11 +155,14 @@ 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;
 
+		protected:
+			void handleConnected();
+
 		private:
 			Storages* storages;
 			MemoryStorages* memoryStorages;
@@ -166,6 +182,8 @@ namespace Swift {
 			SubscriptionManager* subscriptionManager;
 			MUCManager* mucManager;
 			ClientDiscoManager* discoManager;
+			JingleSessionManager* jingleSessionManager;
+			FileTransferManager* fileTransferManager;
 			BlindCertificateTrustChecker* blindCertificateTrustChecker;
 	};
 }