summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-07-01 20:13:27 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:52:57 (GMT)
commit5b030224c25dcb7e0f8dabe9ba80cc6d6397320b (patch)
tree71aa4e7d4ddeaa172fe233b096d4c354cc9ecb6f /Swift/Controllers/Chat
parentdd28860d46fb873bd9ff221f0ef639c932c22bb8 (diff)
downloadswift-contrib-5b030224c25dcb7e0f8dabe9ba80cc6d6397320b.zip
swift-contrib-5b030224c25dcb7e0f8dabe9ba80cc6d6397320b.tar.bz2
Dump message logs using new db structure. Avatars not working
Diffstat (limited to 'Swift/Controllers/Chat')
-rw-r--r--Swift/Controllers/Chat/ChatController.cpp4
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index b0413af..632d760 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -353,9 +353,9 @@ boost::optional<boost::posix_time::ptime> ChatController::getMessageTimestamp(bo
return message->getTimestamp();
}
-void ChatController::logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool isIncoming) {
+void ChatController::logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool /* isIncoming */) {
if (historyController_) {
- historyController_->addMessage(message, fromJID, toJID, timeStamp);
+ historyController_->addMessage(message, fromJID, toJID, false, timeStamp);
}
}
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 222fb01..f86c726 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -783,7 +783,7 @@ void MUCController::handleAffiliationListReceived(MUCOccupant::Affiliation affil
void MUCController::logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool isIncoming) {
// log only incoming messages
if (isIncoming && historyController_) {
- historyController_->addMessage(message, fromJID, toJID, timeStamp);
+ historyController_->addMessage(message, fromJID, toJID, true, timeStamp);
}
}