Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-08-01 16:18:41 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-08-03 09:25:24 (GMT) |
| commit | 331c6d2570b76f126491e9c955963879c5a76a54 (patch) | |
| tree | af964ad4e106e85c5d2a7c699495d4aada3d806a /Swift/Controllers/Chat/ChatsManager.cpp | |
| parent | dbd57ffd259b9dba6990de0b02b450fa2a59a563 (diff) | |
| download | swift-331c6d2570b76f126491e9c955963879c5a76a54.zip swift-331c6d2570b76f126491e9c955963879c5a76a54.tar.bz2 | |
Open corresponding chat window when sending files via roster
Incoming and outgoing file transfers open the corresponding
chat window, but only for outgoing file transfers the window
is activated, i.e. shown at the top and focused. For incoming
transfers the window is opened in the background.
Test-Information:
Tested on OS X 10.11.6 with Qt 5.5.1 against another Swift
instance.
Change-Id: Ie786c135d4f7854a558561cadd715dc87a209316
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index f3bb8d3..232d903 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -975,6 +975,9 @@ void ChatsManager::handleMUCBookmarkActivated(const MUCBookmark& mucBookmark) { void ChatsManager::handleNewFileTransferController(FileTransferController* ftc) { ChatController* chatController = getChatControllerOrCreate(ftc->getOtherParty()); chatController->handleNewFileTransferController(ftc); + if (!ftc->isIncoming()) { + chatController->activateChatWindow(); + } } void ChatsManager::handleWhiteboardSessionRequest(const JID& contact, bool senderIsSelf) { |