Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-30 08:02:15 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-12-17 18:41:04 (GMT) |
| commit | 523dbfb769069663eda19e381ad35f466b1ef27c (patch) | |
| tree | 0fb00c1655274b8734de517bd1761931eddb5b49 /Swift/QtUI/QtChatWindow.cpp | |
| parent | 359799239fe61fae51a3a005e588af03a18d8a10 (diff) | |
| download | swift-523dbfb769069663eda19e381ad35f466b1ef27c.zip swift-523dbfb769069663eda19e381ad35f466b1ef27c.tar.bz2 | |
Show file-transfer description if provided
Test-Information:
Tested by transferring a file between two Swift instances.
Tested in WebKit chat views and in plain chat views.
Change-Id: Ie46cbd7bac8a36478f64b4557cf55926e6d4af37
Diffstat (limited to 'Swift/QtUI/QtChatWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index abbfae5..caa556f 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -906,9 +906,9 @@ void QtChatWindow::replaceWithAction(const ChatMessage& message, const std::stri messageLog_->replaceWithAction(message, id, time, highlight); } -std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) { +std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) { handleAppendedToLog(); - return messageLog_->addFileTransfer(senderName, senderIsSelf, filename, sizeInBytes); + return messageLog_->addFileTransfer(senderName, senderIsSelf, filename, sizeInBytes, description); } void QtChatWindow::setFileTransferProgress(std::string id, const int percentageDone) { |