1 files changed, 10 insertions, 5 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 59e1c05..5188789 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -1,12 +1,13 @@
 #ifndef SWIFTEN_Client_H
 #define SWIFTEN_Client_H
 
 #include <boost/signals.hpp>
 #include <boost/shared_ptr.hpp>
 
+#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 "Swiften/Base/String.h"
@@ -17,12 +18,13 @@
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 
 namespace Swift {
 	class TLSLayerFactory;
 	class ConnectionFactory;
 	class ClientSession;
+	class BasicSessionStream;
 
 	class Client : public StanzaChannel, public IQRouter, public boost::bsignals::trackable {
 		public:
 			Client(const JID& jid, const String& password);
 			~Client();
 
@@ -35,36 +37,39 @@ namespace Swift {
 
 			virtual void sendIQ(boost::shared_ptr<IQ>);
 			virtual void sendMessage(boost::shared_ptr<Message>);
 			virtual void sendPresence(boost::shared_ptr<Presence>);
 
 		public:
-			boost::signal<void (ClientError)> onError;
+			boost::signal<void (const ClientError&)> onError;
 			boost::signal<void ()> onConnected;
 			boost::signal<void (const String&)> onDataRead;
 			boost::signal<void (const String&)> onDataWritten;
 
 		private:
 			void handleConnectionConnectFinished(bool error);
 			void send(boost::shared_ptr<Stanza>);
 			virtual String getNewIQID();
 			void handleElement(boost::shared_ptr<Element>);
-			void handleSessionFinished(const boost::optional<Session::SessionError>& error);
+			void handleSessionFinished(boost::shared_ptr<Error>);
 			void handleNeedCredentials();
-			void handleDataRead(const ByteArray&);
-			void handleDataWritten(const ByteArray&);
+			void handleDataRead(const String&);
+			void handleDataWritten(const String&);
+
+			void reset();
 
 		private:
 			JID jid_;
 			String password_;
 			IDGenerator idGenerator_;
 			ConnectionFactory* connectionFactory_;
 			TLSLayerFactory* tlsLayerFactory_;
 			FullPayloadParserFactoryCollection payloadParserFactories_;
 			FullPayloadSerializerCollection payloadSerializers_;
-			boost::shared_ptr<ClientSession> session_;
 			boost::shared_ptr<Connection> connection_;
+			boost::shared_ptr<BasicSessionStream> sessionStream_;
+			boost::shared_ptr<ClientSession> session_;
 			String certificate_;
 	};
 }
 
 #endif