From bc0069c02f0c10a6f94f2718282ee6bc84864c1d Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Sat, 3 Mar 2001 20:55:06 +0000
Subject: [PATCH] ignore_get_key() moved to fe-common, fixed printing "*"
 ignore key. Doesn't print unignore messages when /RELOADing config.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1319 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/core/ignore.c              | 33 ++++++++++-----------------------
 src/core/ignore.h              |  2 --
 src/fe-common/core/fe-ignore.c | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 0721d826..0432de05 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -260,21 +260,6 @@ IGNORE_REC *ignore_find(const char *servertag, const char *mask,
 	return NULL;
 }
 
-char *ignore_get_key(IGNORE_REC *rec)
-{
-	char *chans, *ret;
-
-	if (rec->channels == NULL)
-		return rec->mask != NULL ? g_strdup(rec->mask) : NULL;
-
-	chans = g_strjoinv(",", rec->channels);
-	if (rec->mask == NULL) return chans;
-
-	ret = g_strdup_printf("%s %s", rec->mask, chans);
-	g_free(chans);
-	return ret;
-}
-
 static void ignore_set_config(IGNORE_REC *rec)
 {
 	CONFIG_NODE *node;
@@ -351,13 +336,15 @@ void ignore_add_rec(IGNORE_REC *rec)
 		signal_emit("autoignore new", 1, rec);
 }
 
-static void ignore_destroy(IGNORE_REC *rec)
+static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 {
 	ignores = g_slist_remove(ignores, rec);
-	if (!rec->autoignore)
-		signal_emit("ignore destroyed", 1, rec);
-	else
-		signal_emit("autoignore destroyed", 1, rec);
+	if (send_signal) {
+		if (!rec->autoignore)
+			signal_emit("ignore destroyed", 1, rec);
+		else
+			signal_emit("autoignore destroyed", 1, rec);
+	}
 
 #ifdef HAVE_REGEX_H
 	if (rec->regexp_compiled) regfree(&rec->preg);
@@ -377,7 +364,7 @@ void ignore_update_rec(IGNORE_REC *rec)
 	if (rec->level == 0) {
 		/* unignored everything */
 		ignore_remove_config(rec);
-		ignore_destroy(rec);
+		ignore_destroy(rec, TRUE);
 	} else {
 		/* unignore just some levels.. */
 		ignore_remove_config(rec);
@@ -405,7 +392,7 @@ static void read_ignores(void)
 	GSList *tmp;
 
 	while (ignores != NULL)
-                ignore_destroy(ignores->data);
+                ignore_destroy(ignores->data, FALSE);
 
 	node = iconfig_node_traverse("ignores", FALSE);
 	if (node == NULL) {
@@ -486,7 +473,7 @@ void ignore_init(void)
 void ignore_deinit(void)
 {
 	while (ignores != NULL)
-                ignore_destroy(ignores->data);
+                ignore_destroy(ignores->data, TRUE);
         nickmatch_deinit(nickmatch);
 
 	signal_remove("setup reread", (SIGNAL_FUNC) read_ignores);
diff --git a/src/core/ignore.h b/src/core/ignore.h
index a8e30ada..718630d8 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -33,8 +33,6 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 
 IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
 
-char *ignore_get_key(IGNORE_REC *rec);
-
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 2af5f655..bab6b00e 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -29,6 +29,21 @@
 #include "ignore.h"
 #include "printtext.h"
 
+static char *ignore_get_key(IGNORE_REC *rec)
+{
+	char *chans, *ret;
+
+	if (rec->channels == NULL)
+		return g_strdup(rec->mask != NULL ? rec->mask : "*" );
+
+	chans = g_strjoinv(",", rec->channels);
+	if (rec->mask == NULL) return chans;
+
+	ret = g_strdup_printf("%s %s", rec->mask, chans);
+	g_free(chans);
+	return ret;
+}
+
 static void ignore_print(int index, IGNORE_REC *rec)
 {
 	GString *options;