Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-09 08:30:11 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-07-10 14:00:16 (GMT) |
| commit | 7af21fdd59af3b3112cff69996301605859af84c (patch) | |
| tree | 5a1c79ac5d8c3a5521b098f68ae6c190a291455c /Swift/Controllers/Chat | |
| parent | a23d903d67f05257f0e9376a212b83045ea768f1 (diff) | |
| download | swift-7af21fdd59af3b3112cff69996301605859af84c.zip swift-7af21fdd59af3b3112cff69996301605859af84c.tar.bz2 | |
Create notice events for incoming file-transfers
Test-Information:
Send a file from one Swift instance to another. The UX is similar to
that of a MUC invite, clicking the notice will bring the relevant chat
in front.
Change-Id: Ief3cd7371ae01b2b38b6d1af36189df961eacef4
Diffstat (limited to 'Swift/Controllers/Chat')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 7595d44..f39f503 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp | |||
| @@ -59,10 +59,11 @@ | |||
| 59 | #include <Swift/Controllers/UIInterfaces/ChatListWindowFactory.h> | 59 | #include <Swift/Controllers/UIInterfaces/ChatListWindowFactory.h> |
| 60 | #include <Swift/Controllers/UIInterfaces/JoinMUCWindow.h> | 60 | #include <Swift/Controllers/UIInterfaces/JoinMUCWindow.h> |
| 61 | #include <Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h> | 61 | #include <Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h> |
| 62 | #include <Swift/Controllers/WhiteboardManager.h> | 62 | #include <Swift/Controllers/WhiteboardManager.h> |
| 63 | #include <Swift/Controllers/XMPPEvents/EventController.h> | 63 | #include <Swift/Controllers/XMPPEvents/EventController.h> |
| 64 | #include <Swift/Controllers/XMPPEvents/IncomingFileTransferEvent.h> | ||
| 64 | 65 | ||
| 65 | BOOST_CLASS_VERSION(Swift::ChatListWindow::Chat, 1) | 66 | BOOST_CLASS_VERSION(Swift::ChatListWindow::Chat, 1) |
| 66 | 67 | ||
| 67 | namespace boost { | 68 | namespace boost { |
| 68 | namespace serialization { | 69 | namespace serialization { |
| @@ -927,10 +928,13 @@ void ChatsManager::handleMUCBookmarkActivated(const MUCBookmark& mucBookmark) { | |||
| 927 | 928 | ||
| 928 | void ChatsManager::handleNewFileTransferController(FileTransferController* ftc) { | 929 | void ChatsManager::handleNewFileTransferController(FileTransferController* ftc) { |
| 929 | ChatController* chatController = getChatControllerOrCreate(ftc->getOtherParty()); | 930 | ChatController* chatController = getChatControllerOrCreate(ftc->getOtherParty()); |
| 930 | chatController->handleNewFileTransferController(ftc); | 931 | chatController->handleNewFileTransferController(ftc); |
| 931 | chatController->activateChatWindow(); | 932 | chatController->activateChatWindow(); |
| 933 | if (ftc->isIncoming()) { | ||
| 934 | eventController_->handleIncomingEvent(boost::make_shared<IncomingFileTransferEvent>(ftc->getOtherParty())); | ||
| 935 | } | ||
| 932 | } | 936 | } |
| 933 | 937 | ||
| 934 | void ChatsManager::handleWhiteboardSessionRequest(const JID& contact, bool senderIsSelf) { | 938 | void ChatsManager::handleWhiteboardSessionRequest(const JID& contact, bool senderIsSelf) { |
| 935 | ChatController* chatController = getChatControllerOrCreate(contact); | 939 | ChatController* chatController = getChatControllerOrCreate(contact); |
| 936 | chatController->handleWhiteboardSessionRequest(senderIsSelf); | 940 | chatController->handleWhiteboardSessionRequest(senderIsSelf); |