summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-06-30 16:39:36 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:52:57 (GMT)
commite117ec6c534e1b6bc3f1bcd18dadf2005672c38b (patch)
tree71b1ef76e57f37693cd60b13ac17e92faaa33ed4 /Swift/Controllers/Chat/ChatControllerBase.cpp
parent3a13bbd772f549a3ea218fe9f3a8ca6c293989f9 (diff)
downloadswift-contrib-e117ec6c534e1b6bc3f1bcd18dadf2005672c38b.zip
swift-contrib-e117ec6c534e1b6bc3f1bcd18dadf2005672c38b.tar.bz2
Changed HistoryMessage structure back
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index ee3a027..9d797e0 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -149,7 +149,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);
}
}
@@ -258,7 +258,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);
}
}
}