1 files changed, 10 insertions, 2 deletions
diff --git a/Swiften/Session/BasicSessionStream.h b/Swiften/Session/BasicSessionStream.h
index bf92bbb..d248ebc 100644
--- a/Swiften/Session/BasicSessionStream.h
+++ b/Swiften/Session/BasicSessionStream.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 #include "Swiften/Network/Connection.h"
 #include "Swiften/Session/SessionStream.h"
 
 namespace Swift {
   class TLSLayerFactory;
@@ -14,22 +15,24 @@ namespace Swift {
   class StreamStack;
 	class XMPPLayer;
   class ConnectionLayer;
 
   class BasicSessionStream : 
       public SessionStream, 
-      public boost::BOOST_SIGNALS_NAMESPACE::trackable {
+      public boost::enable_shared_from_this<BasicSessionStream> {
     public:
       BasicSessionStream(
 		    boost::shared_ptr<Connection> connection,
         PayloadParserFactoryCollection* payloadParserFactories, 
         PayloadSerializerCollection* payloadSerializers,
 		    TLSLayerFactory* tlsLayerFactory
       );
       ~BasicSessionStream();
 
+			void initialize();
+
 			virtual void writeHeader(const ProtocolHeader& header);
 			virtual void writeElement(boost::shared_ptr<Element>);
 
 			virtual bool supportsTLSEncryption();
 			virtual void addTLSEncryption();
 
@@ -37,16 +40,21 @@ namespace Swift {
 
 			virtual void resetXMPPParser();
 
     private:
       void handleXMPPError();
       void handleTLSError();
+			void handleStreamStartReceived(const ProtocolHeader&);
+			void handleElementReceived(boost::shared_ptr<Element>);
 
     private:
+			boost::shared_ptr<Connection> connection;
+			PayloadParserFactoryCollection* payloadParserFactories;
+			PayloadSerializerCollection* payloadSerializers;
+			TLSLayerFactory* tlsLayerFactory;
 			boost::shared_ptr<XMPPLayer> xmppLayer;
 			boost::shared_ptr<ConnectionLayer> connectionLayer;
 			StreamStack* streamStack;
-      TLSLayerFactory* tlsLayerFactory;
       boost::shared_ptr<TLSLayer> tlsLayer;
       boost::shared_ptr<WhitespacePingLayer> whitespacePingLayer;
   };
 }