From 55b9f6759ab637e9365693b3b34f04ecc211608d Mon Sep 17 00:00:00 2001
From: Richard Maudsley <richard.maudsley@isode.com>
Date: Wed, 22 Jan 2014 14:54:41 +0000
Subject: More work on Highlight rules.

Change-Id: I8a3f860f6731801759f48b0160b6285ddfdfd75d

diff --git a/Swift/Controllers/HighlightRule.cpp b/Swift/Controllers/HighlightRule.cpp
index 91bd3ab..622fbad 100644
--- a/Swift/Controllers/HighlightRule.cpp
+++ b/Swift/Controllers/HighlightRule.cpp
@@ -70,11 +70,12 @@ bool HighlightRule::isMatch(const std::string& body, const std::string& sender,
 			}
 		}
 
-		if (!matchesKeyword && nickIsKeyword_ && !nick.empty()) {
-			if (boost::regex_search(body, regexFromString(nick))) {
-				matchesKeyword = true;
-			}
-		}
+		/* keyword highlighting has now moved to ChatMessageParser.cpp */
+		//if (!matchesKeyword && nickIsKeyword_ && !nick.empty()) {
+			//if (boost::regex_search(body, regexFromString(nick))) {
+				//matchesKeyword = true;
+			//}
+		//}
 
 		foreach (const boost::regex & rx, senderRegex_) {
 			if (boost::regex_search(sender, rx)) {
-- 
cgit v0.10.2-6-g49f6