From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Thu, 1 Mar 2018 23:59:50 +0000 (-0600)
Subject: Really use Remote Highlights for nick, not Local
X-Git-Tag: travis-deploy-test~96
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f2e4560b71a1888599ca2153eee36a9b4136c902

Really use Remote Highlights for nick, not Local

Really disable local nick highlights by default.  This will affect
those who upgrade and haven't changed the default highlight settings.
No settings migration provided since we intend to migrate to
core-side highlights entirely in the future.

Really enable remote nick highlights by default, setting a default
value for when highlights are not yet set up.  Fixes behavior of no
nickname highlighting by default.
---

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index cccae3ab..ddeb9c1c 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -320,7 +320,7 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT
 
 NotificationSettings::HighlightNickType NotificationSettings::highlightNick()
 {
-    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
+    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt();
 }
 
 
diff --git a/src/common/highlightrulemanager.cpp b/src/common/highlightrulemanager.cpp
index f23f6aae..21b89329 100644
--- a/src/common/highlightrulemanager.cpp
+++ b/src/common/highlightrulemanager.cpp
@@ -104,7 +104,11 @@ void HighlightRuleManager::initSetHighlightRuleList(const QVariantMap &highlight
         _highlightRuleList << HighlightRule(name[i], isRegEx[i].toBool(), isCaseSensitive[i].toBool(),
                                             isActive[i].toBool(), isInverse[i].toBool(), sender[i], channel[i]);
     }
-    _highlightNick = HighlightNickType(highlightRuleList["highlightNick"].toInt());
+
+    // Make sure the default for _highlightNick is "CurrentNick" if not set
+    _highlightNick = HighlightNickType(
+                highlightRuleList.value("highlightNick", HighlightNickType::CurrentNick).toInt());
+
     _nicksCaseSensitive = highlightRuleList["nicksCaseSensitive"].toBool();
 }