Swiftdiff options
| author | Catalin Badea <catalin.badea392@gmail.com> | 2012-04-13 19:52:51 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-04-14 15:45:03 (GMT) |
| commit | 54aad4467142079f74471da6396ad31c9df389df (patch) | |
| tree | f4af60c5cf308e17e750afa71c5bb14c941fa0cc /Swift/Controllers/Chat/ChatControllerBase.h | |
| parent | d4517116fc71d1b2d5967004757630293613e928 (diff) | |
| download | swift-54aad4467142079f74471da6396ad31c9df389df.zip swift-54aad4467142079f74471da6396ad31c9df389df.tar.bz2 | |
Fix correction from breaking /me actions
Check if the new message is an action when using correct last message.
Resolves: #1053
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.h')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h index a4d23c0..8a8161d 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.h +++ b/Swift/Controllers/Chat/ChatControllerBase.h @@ -46,6 +46,7 @@ namespace Swift { void setAvailableServerFeatures(boost::shared_ptr<DiscoInfo> info); void handleIncomingMessage(boost::shared_ptr<MessageEvent> message); std::string addMessage(const std::string& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time); + void replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time); virtual void setOnline(bool online); virtual void setEnabled(bool enabled); virtual void setToJID(const JID& jid) {toJID_ = jid;}; |