Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-23 13:04:01 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-30 09:09:39 (GMT) |
| commit | 3bc016cc6e477ef653970564b74948dc62b7022a (patch) | |
| tree | d5832d13dcb5a061e7bdd6611a484540f12da289 /Swift/QtUI/QtPlainChatView.cpp | |
| parent | 6ce9e6bfa735ebeb577a308a1dd51a3424f5f0fe (diff) | |
| download | swift-contrib-3bc016cc6e477ef653970564b74948dc62b7022a.zip swift-contrib-3bc016cc6e477ef653970564b74948dc62b7022a.tar.bz2 | |
Show most recent time when squashing presence, not the earliest
Change-Id: I661b80d589386cf69d720f2786723afb2ab2f2ed
Diffstat (limited to 'Swift/QtUI/QtPlainChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtPlainChatView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtPlainChatView.cpp b/Swift/QtUI/QtPlainChatView.cpp index ee76438..23bf0af 100644 --- a/Swift/QtUI/QtPlainChatView.cpp +++ b/Swift/QtUI/QtPlainChatView.cpp @@ -148,19 +148,19 @@ void QtPlainChatView::replaceWithAction(const ChatWindow::ChatMessage& message, text += P2QSTRING(lastMessageLabel_[id]->getLabel()) + "<br/>"; } QString name = id.empty() ? "you" : P2QSTRING(id); text += QString(tr("At %1 %2 corrected the last action to: <i>")).arg(ChatSnippet::timeToEscapedString(B2QDATE(time))).arg(name); text += chatMessageToString(message); text += "</i></p>"; log_->append(text); } -void QtPlainChatView::replaceLastMessage(const ChatWindow::ChatMessage& message) +void QtPlainChatView::replaceLastMessage(const ChatWindow::ChatMessage& message, const ChatWindow::TimestampBehaviour /*timestampBehaviour*/) { QString text = "<p>The last message was corrected to:<br/>"; text += chatMessageToString(message); text += "</p>"; log_->append(text); } void QtPlainChatView::setAckState(const std::string& /*id*/, ChatWindow::AckState state) { |