summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-11-30 08:02:15 (GMT)
committerSwift Review <review@swift.im>2015-12-17 18:41:04 (GMT)
commit523dbfb769069663eda19e381ad35f466b1ef27c (patch)
tree0fb00c1655274b8734de517bd1761931eddb5b49 /Swiften/FileTransfer/FileTransfer.cpp
parent359799239fe61fae51a3a005e588af03a18d8a10 (diff)
downloadswift-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 'Swiften/FileTransfer/FileTransfer.cpp')
-rw-r--r--Swiften/FileTransfer/FileTransfer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/FileTransfer.cpp b/Swiften/FileTransfer/FileTransfer.cpp
index f63a4e8..4782d39 100644
--- a/Swiften/FileTransfer/FileTransfer.cpp
+++ b/Swiften/FileTransfer/FileTransfer.cpp
@@ -19,7 +19,8 @@ void FileTransfer::setState(const State& state) {
onStateChanged(state);
}
-void FileTransfer::setFileInfo(const std::string& name, boost::uintmax_t size) {
+void FileTransfer::setFileInfo(const std::string& name, boost::uintmax_t size, const std::string& description) {
filename_ = name;
fileSizeInBytes_ = size;
+ description_ = description;
}