1 files changed, 7 insertions, 5 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 083b8a0..08289a5 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;
@@ -47,7 +49,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 +87,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 +144,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;