Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/FileTransfer
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer')
-rw-r--r--Swiften/FileTransfer/FileTransferManagerImpl.cpp1
-rw-r--r--Swiften/FileTransfer/IncomingFileTransferManager.cpp8
-rw-r--r--Swiften/FileTransfer/IncomingFileTransferManager.h5
3 files changed, 4 insertions, 10 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index f4f9517..9dc9d0d 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -75,11 +75,10 @@ FileTransferManagerImpl::FileTransferManagerImpl(
75 transporterFactory, 75 transporterFactory,
76 timerFactory, 76 timerFactory,
77 crypto); 77 crypto);
78 incomingFTManager = new IncomingFileTransferManager( 78 incomingFTManager = new IncomingFileTransferManager(
79 jingleSessionManager, 79 jingleSessionManager,
80 iqRouter,
81 transporterFactory, 80 transporterFactory,
82 timerFactory, 81 timerFactory,
83 crypto); 82 crypto);
84 incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer); 83 incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer);
85} 84}
diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.cpp b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
index 239c4a8..c1cc757 100644
--- a/Swiften/FileTransfer/IncomingFileTransferManager.cpp
+++ b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
@@ -1,7 +1,7 @@
1/* 1/*
2 * Copyright (c) 2010-2014 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#include <Swiften/FileTransfer/IncomingFileTransferManager.h> 7#include <Swiften/FileTransfer/IncomingFileTransferManager.h>
@@ -11,24 +11,22 @@
11#include <Swiften/Base/Log.h> 11#include <Swiften/Base/Log.h>
12#include <Swiften/Elements/JingleDescription.h> 12#include <Swiften/Elements/JingleDescription.h>
13#include <Swiften/Elements/JingleFileTransferDescription.h> 13#include <Swiften/Elements/JingleFileTransferDescription.h>
14#include <Swiften/Elements/JingleIBBTransportPayload.h> 14#include <Swiften/Elements/JingleIBBTransportPayload.h>
15#include <Swiften/Elements/JingleS5BTransportPayload.h> 15#include <Swiften/Elements/JingleS5BTransportPayload.h>
16#include <Swiften/Jingle/JingleSessionManager.h>
17#include <Swiften/Jingle/Jingle.h>
18#include <Swiften/FileTransfer/IncomingJingleFileTransfer.h> 16#include <Swiften/FileTransfer/IncomingJingleFileTransfer.h>
17#include <Swiften/Jingle/Jingle.h>
18#include <Swiften/Jingle/JingleSessionManager.h>
19 19
20namespace Swift { 20namespace Swift {
21 21
22IncomingFileTransferManager::IncomingFileTransferManager( 22IncomingFileTransferManager::IncomingFileTransferManager(
23 JingleSessionManager* jingleSessionManager, 23 JingleSessionManager* jingleSessionManager,
24 IQRouter* router,
25 FileTransferTransporterFactory* transporterFactory, 24 FileTransferTransporterFactory* transporterFactory,
26 TimerFactory* timerFactory, 25 TimerFactory* timerFactory,
27 CryptoProvider* crypto) : 26 CryptoProvider* crypto) :
28 jingleSessionManager(jingleSessionManager), 27 jingleSessionManager(jingleSessionManager),
29 router(router),
30 transporterFactory(transporterFactory), 28 transporterFactory(transporterFactory),
31 timerFactory(timerFactory), 29 timerFactory(timerFactory),
32 crypto(crypto) { 30 crypto(crypto) {
33 jingleSessionManager->addIncomingSessionHandler(this); 31 jingleSessionManager->addIncomingSessionHandler(this);
34} 32}
diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.h b/Swiften/FileTransfer/IncomingFileTransferManager.h
index 6edf53b..285ff3f 100644
--- a/Swiften/FileTransfer/IncomingFileTransferManager.h
+++ b/Swiften/FileTransfer/IncomingFileTransferManager.h
@@ -12,25 +12,23 @@
12#include <Swiften/Base/boost_bsignals.h> 12#include <Swiften/Base/boost_bsignals.h>
13#include <Swiften/FileTransfer/IncomingFileTransfer.h> 13#include <Swiften/FileTransfer/IncomingFileTransfer.h>
14#include <Swiften/Jingle/IncomingJingleSessionHandler.h> 14#include <Swiften/Jingle/IncomingJingleSessionHandler.h>
15 15
16namespace Swift { 16namespace Swift {
17 class IQRouter;
18 class JingleSessionManager; 17 class JingleSessionManager;
19 class FileTransferTransporterFactory; 18 class FileTransferTransporterFactory;
20 class TimerFactory; 19 class TimerFactory;
21 class CryptoProvider; 20 class CryptoProvider;
22 21
23 class SWIFTEN_API IncomingFileTransferManager : public IncomingJingleSessionHandler { 22 class SWIFTEN_API IncomingFileTransferManager : public IncomingJingleSessionHandler {
24 public: 23 public:
25 IncomingFileTransferManager( 24 IncomingFileTransferManager(
26 JingleSessionManager* jingleSessionManager, 25 JingleSessionManager* jingleSessionManager,
27 IQRouter* router,
28 FileTransferTransporterFactory* transporterFactory, 26 FileTransferTransporterFactory* transporterFactory,
29 TimerFactory* timerFactory, 27 TimerFactory* timerFactory,
30 CryptoProvider* crypto); 28 CryptoProvider* crypto);
31 ~IncomingFileTransferManager(); 29 virtual ~IncomingFileTransferManager();
32 30
33 boost::signal<void (IncomingFileTransfer::ref)> onIncomingFileTransfer; 31 boost::signal<void (IncomingFileTransfer::ref)> onIncomingFileTransfer;
34 32
35 private: 33 private:
36 bool handleIncomingJingleSession( 34 bool handleIncomingJingleSession(
@@ -38,11 +36,10 @@ namespace Swift {
38 const std::vector<JingleContentPayload::ref>& contents, 36 const std::vector<JingleContentPayload::ref>& contents,
39 const JID& recipient); 37 const JID& recipient);
40 38
41 private: 39 private:
42 JingleSessionManager* jingleSessionManager; 40 JingleSessionManager* jingleSessionManager;
43 IQRouter* router;
44 FileTransferTransporterFactory* transporterFactory; 41 FileTransferTransporterFactory* transporterFactory;
45 TimerFactory* timerFactory; 42 TimerFactory* timerFactory;
46 CryptoProvider* crypto; 43 CryptoProvider* crypto;
47 }; 44 };
48} 45}