summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-13 13:58:23 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-13 13:58:23 (GMT)
commit100b241cb895bbb077eed4bc24be8fea65bce57a (patch)
tree8d070508bdbe28eb52387f82817e97ff6224263b /Swift/QtUI
parenta0e84b673802e90c8464d96993ba2495ef9dcd5e (diff)
downloadswift-100b241cb895bbb077eed4bc24be8fea65bce57a.zip
swift-100b241cb895bbb077eed4bc24be8fea65bce57a.tar.bz2
Convert newlines to <br/> after linkifying.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtChatWindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index d5cadf4..b1f6c5a 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -239,8 +239,8 @@ void QtChatWindow::addMessage(const String &message, const String &senderName, b
htmlString += QString("%3</span> ").arg(Qt::escape(P2QSTRING(label->getDisplayMarking())));
}
QString messageHTML(Qt::escape(P2QSTRING(message)));
- messageHTML.replace("\n","<br/>");
messageHTML = P2QSTRING(Linkify::linkify(Q2PSTRING(messageHTML)));
+ messageHTML.replace("\n","<br/>");
QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
QString styleSpanEnd = style == "" ? "" : "</span>";
htmlString += styleSpanStart + messageHTML + styleSpanEnd;