Add new setting to optionally modify behaviour of hilight_nick_matches

Fix indentation

Remove unused variables that crept into the nick_match_msg_everywhere function

2 files changed, 10 insertions, 0 deletions

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index a96b8a9e..c88f5d6d 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "misc.h"
+#include "settings.h"
 
 #include "servers.h"
 #include "channels.h"
@@ -571,6 +572,14 @@ int nick_match_msg(CHANNEL_REC *channel, const char *msg, const char *nick)
 	}
 }
 
+int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char *nick)
+{
+	g_return_val_if_fail(nick != NULL, FALSE);
+	g_return_val_if_fail(msg != NULL, FALSE);
+
+	return stristr_full(msg, nick);
+}
+
 void nicklist_init(void)
 {
 	signal_add_first("channel created", (SIGNAL_FUNC) sig_channel_created);
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 55dfd5ef..5e0f4f75 100644
--- a/src/core/nicklist.h
+++ b/src/core/nicklist.h
@@ -55,6 +55,7 @@ int nicklist_compare(NICK_REC *p1, NICK_REC *p2, const char *nick_prefix);
 
 /* Check is `msg' is meant for `nick'. */
 int nick_match_msg(CHANNEL_REC *channel, const char *msg, const char *nick);
+int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char *nick);
 
 void nicklist_init(void);
 void nicklist_deinit(void);