Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-03-14 15:44:38 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-03-14 15:44:38 (GMT) |
| commit | 3368a6e5f220f00e03b3ebb41bdd8872ffdf81be (patch) | |
| tree | 55d8a8745028f6765f53311d1f14ddf4dbc24691 /Swift/Controllers/FileTransfer | |
| parent | 37057bc3168b43906dd67e51607a893ae1c490af (diff) | |
| download | swift-3368a6e5f220f00e03b3ebb41bdd8872ffdf81be.zip swift-3368a6e5f220f00e03b3ebb41bdd8872ffdf81be.tar.bz2 | |
Show correct avatars for file-transfer messages
Previously we simply showed our default avatar. With this
change we will use the same avatar as we use for normal
chat messages.
Test-Information:
Tested on macOS 10.12.3 with Qt 5.5.1 by exchanging files
between two Swift instances.
Change-Id: I20b953a67a290820900b5b35861c1e17f72148bd
Diffstat (limited to 'Swift/Controllers/FileTransfer')
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.cpp | 8 | ||||
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index 65c2892..27e9dbf 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2015-2016 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -47,12 +47,12 @@ const JID &FileTransferController::getOtherParty() const { return otherParty; } -std::string FileTransferController::setChatWindow(ChatWindow* wnd, std::string nickname) { +std::string FileTransferController::setChatWindow(ChatWindow* wnd, const std::string& nickname, const std::string& avatarPath) { chatWindow = wnd; if (sending) { - uiID = wnd->addFileTransfer(QT_TRANSLATE_NOOP("", "me"), true, filename, boost::filesystem::file_size(boost::filesystem::path(filename)), ""); + uiID = wnd->addFileTransfer(QT_TRANSLATE_NOOP("", "me"), avatarPath, true, filename, boost::filesystem::file_size(boost::filesystem::path(filename)), ""); } else { - uiID = wnd->addFileTransfer(nickname, false, filename, transfer->getFileSizeInBytes(), transfer->getDescription()); + uiID = wnd->addFileTransfer(nickname, avatarPath, false, filename, transfer->getFileSizeInBytes(), transfer->getDescription()); } return uiID; } diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h index 38dde0e..e36cac8 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.h +++ b/Swift/Controllers/FileTransfer/FileTransferController.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2015-2016 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -43,7 +43,7 @@ public: FileTransferController(IncomingFileTransfer::ref transfer); ~FileTransferController(); - std::string setChatWindow(ChatWindow*, std::string nickname); + std::string setChatWindow(ChatWindow*, const std::string& nickname, const std::string& avatarPath); void setReceipient(const JID& otherParty); void start(std::string& description); |