1 files changed, 18 insertions, 15 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 23bc099..1486293 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -530,18 +530,34 @@ std::string QtWebKitChatView::addMessage(
 		const std::string& senderName, 
 		bool senderIsSelf, 
 		boost::shared_ptr<SecurityLabel> label, 
 		const std::string& avatarPath, 
 		const boost::posix_time::ptime& time, 
 		const HighlightAction& highlight) {
 	return addMessage(chatMessageToHTML(message), senderName, senderIsSelf, label, avatarPath, "", time, highlight, ChatSnippet::getDirection(message));
 }
 
+QString QtWebKitChatView::getHighlightSpanStart(const std::string& text, const std::string& background) {
+	QString ecsapeColor = QtUtilities::htmlEscape(P2QSTRING(text));
+	QString escapeBackground = QtUtilities::htmlEscape(P2QSTRING(background));
+	if (ecsapeColor.isEmpty()) {
+		ecsapeColor = "black";
+	}
+	if (escapeBackground.isEmpty()) {
+		escapeBackground = "yellow";
+	}
+	return QString("<span style=\"color: %1; background: %2\">").arg(ecsapeColor).arg(escapeBackground);
+}
+
+QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) {
+	return getHighlightSpanStart(highlight.getTextColor(), highlight.getTextBackground());
+}
+
 QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& message) {
 	QString result;
 	foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, message.getParts()) {
 		boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;
 		boost::shared_ptr<ChatWindow::ChatURIMessagePart> uriPart;
 		boost::shared_ptr<ChatWindow::ChatEmoticonMessagePart> emoticonPart;
 		boost::shared_ptr<ChatWindow::ChatHighlightingMessagePart> highlightPart;
 
 		if ((textPart = boost::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(part))) {
@@ -556,40 +572,27 @@ QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& messa
 			continue;
 		}
 		if ((emoticonPart = boost::dynamic_pointer_cast<ChatWindow::ChatEmoticonMessagePart>(part))) {
 			QString textStyle = showEmoticons_ ? "style='display:none'" : "";
 			QString imageStyle = showEmoticons_ ? "" : "style='display:none'";
 			result += "<span class='swift_emoticon_image' " + imageStyle + "><img src='" + P2QSTRING(emoticonPart->imagePath) + "'/></span><span class='swift_emoticon_text' " + textStyle + ">" + QtUtilities::htmlEscape(P2QSTRING(emoticonPart->alternativeText)) + "</span>";
 			continue;
 		}
 		if ((highlightPart = boost::dynamic_pointer_cast<ChatWindow::ChatHighlightingMessagePart>(part))) {
-			//FIXME: Maybe do something here. Anything, really.
+			QString spanStart = getHighlightSpanStart(highlightPart->foregroundColor, highlightPart->backgroundColor);
+			result += spanStart + QtUtilities::htmlEscape(P2QSTRING(highlightPart->text)) + "</span>";
 			continue;
 		}
 
 	}
 	return result;
 }
 
-
-QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) {
-	QString color = QtUtilities::htmlEscape(P2QSTRING(highlight.getTextColor()));
-	QString background = QtUtilities::htmlEscape(P2QSTRING(highlight.getTextBackground()));
-	if (color.isEmpty()) {
-		color = "black";
-	}
-	if (background.isEmpty()) {
-		background = "yellow";
-	}
-
-	return QString("<span style=\"color: %1; background: %2\">").arg(color).arg(background);
-}
-
 std::string QtWebKitChatView::addMessage(
 		const QString& message, 
 		const std::string& senderName, 
 		bool senderIsSelf, 
 		boost::shared_ptr<SecurityLabel> label, 
 		const std::string& avatarPath, 
 		const QString& style, 
 		const boost::posix_time::ptime& time, 
 		const HighlightAction& highlight,