summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp4
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
65BOOST_CLASS_VERSION(Swift::ChatListWindow::Chat, 1) 66BOOST_CLASS_VERSION(Swift::ChatListWindow::Chat, 1)
66 67
67namespace boost { 68namespace boost {
68namespace serialization { 69namespace serialization {
@@ -927,10 +928,13 @@ void ChatsManager::handleMUCBookmarkActivated(const MUCBookmark& mucBookmark) {
927 928
928void ChatsManager::handleNewFileTransferController(FileTransferController* ftc) { 929void 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
934void ChatsManager::handleWhiteboardSessionRequest(const JID& contact, bool senderIsSelf) { 938void 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);