summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2012-04-24 16:25:10 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-24 17:01:20 (GMT)
commitf8e77a8cbf9e6ad1fc2a51ed16f89a41c0da560b (patch)
tree8e9b28f945f199dd7ead81400a754dc862c5aebf
parent8d200bd989b2893d2eaa03ea9f7fa7863f313547 (diff)
downloadswift-f8e77a8cbf9e6ad1fc2a51ed16f89a41c0da560b.zip
swift-f8e77a8cbf9e6ad1fc2a51ed16f89a41c0da560b.tar.bz2
Setting previous*-flags after handling invite messages.
Resolves: #1100 License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
-rw-r--r--Swift/QtUI/QtChatWindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 42fe0f5..0164ee5 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -882,6 +882,9 @@ void QtChatWindow::addMUCInvitation(const std::string& senderName, const JID& ji
QString qAvatarPath = "qrc:/icons/avatar.png";
messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, false, appendToPrevious, theme_, id)));
+ previousMessageWasSelf_ = false;
+ previousSenderName_ = P2QSTRING(senderName);
+ previousMessageKind_ = PreviousMessageWasMUCInvite;
}
}