Swiftdiff options
| author | Catalin Badea <catalin.badea392@gmail.com> | 2012-06-30 16:39:36 (GMT) |
|---|---|---|
| committer | Catalin Badea <catalin.badea392@gmail.com> | 2012-06-30 16:39:36 (GMT) |
| commit | 497c5dced0df19fc8953b55aa36b4d1e7101620a (patch) | |
| tree | d593893a19873a4aa71d497632071b82bb1672c8 /Swift/Controllers/Chat | |
| parent | faf48256d02f87383aa059033f5800e55cc5c660 (diff) | |
| download | swift-contrib-497c5dced0df19fc8953b55aa36b4d1e7101620a.zip swift-contrib-497c5dced0df19fc8953b55aa36b4d1e7101620a.tar.bz2 | |
Changed HistoryMessage structure back
Diffstat (limited to 'Swift/Controllers/Chat')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index 97b574b..4fc378a 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -146,7 +146,7 @@ void ChatControllerBase::handleSendMessageRequest(const std::string &body, bool // log message if (historyController_) { - historyController_->addMessage(getBaseJID(), selfJID_, std::string("me"), body, now); + historyController_->addMessage(body, selfJID_, toJID_, now); } } @@ -255,7 +255,7 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m else { lastMessagesUIID_[from] = addMessage(body, senderDisplayNameFromMessage(from), isIncomingMessageFromMe(message), label, std::string(avatarManager_->getAvatarPath(from).string()), timeStamp); if (historyController_) { - historyController_->addMessage(getBaseJID(), from, senderDisplayNameFromMessage(from), body, timeStamp); + historyController_->addMessage(body, from, selfJID_, timeStamp); } } } |