1 files changed, 27 insertions, 13 deletions
diff --git a/Swiften/FileTransfer/IBBReceiveSession.h b/Swiften/FileTransfer/IBBReceiveSession.h
index 6d936de..d1c47bf 100644
--- a/Swiften/FileTransfer/IBBReceiveSession.h
+++ b/Swiften/FileTransfer/IBBReceiveSession.h
@@ -7,27 +7,39 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_fwd.hpp>
 
-#include "Swiften/Base/boost_bsignals.h"
-#include "Swiften/FileTransfer/WriteBytestream.h"
-#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/IBB.h"
-#include "Swiften/Elements/ErrorPayload.h"
-#include "Swiften/FileTransfer/FileTransferError.h"
-#include "Swiften/Queries/SetResponder.h"
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/FileTransfer/WriteBytestream.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/IBB.h>
+#include <Swiften/FileTransfer/FileTransferError.h>
 
 namespace Swift {
 	class IQRouter;
 
-	class IBBReceiveSession : public SetResponder<IBB> {
+	class IBBReceiveSession {
 		public:
-			IBBReceiveSession(const std::string& id, const JID& from, size_t size, WriteBytestream::ref bytestream, IQRouter* router);
+			IBBReceiveSession(
+					const std::string& id, 
+					const JID& from, 
+					const JID& to,
+					size_t size, 
+					IQRouter* router);
 			~IBBReceiveSession();
 
 			void start();
 			void stop();
 
+			const JID& getSender() const {
+				return from;
+			}
+
+			const JID& getReceiver() const {
+				return to;
+			}
+
+			boost::signal<void (const std::vector<unsigned char>&)> onDataReceived;
 			boost::signal<void (boost::optional<FileTransferError>)> onFinished;
 
 		private:
@@ -35,13 +47,15 @@ namespace Swift {
 			void finish(boost::optional<FileTransferError>);
 
 		private:
+			class IBBResponder;
+			friend class IBBResponder;
+
 			std::string id;
 			JID from;
+			JID to;
 			size_t size;
-			WriteBytestream::ref bytestream;
 			IQRouter* router;
-			int sequenceNumber;
+			IBBResponder* responder;
 			bool active;
-			size_t receivedSize;
 	};
 }