aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

ignore_get_key() moved to fe-common, fixed printing "*" ignore key.

Browse Source 
Doesn't print unignore messages when /RELOADing config.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1319 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-03-03 20:55:06 +00:00 committed by cras
parent 4f2be94115
commit bc0069c02f
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/ignore.c
View File

@ -260,21 +260,6 @@ IGNORE_REC *ignore_find(const char *servertag, const char *mask,
return NULL; 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) static void ignore_set_config(IGNORE_REC *rec)
{ {
CONFIG_NODE *node; CONFIG_NODE *node;
@ -351,13 +336,15 @@ void ignore_add_rec(IGNORE_REC *rec)
signal_emit("autoignore new", 1, 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); ignores = g_slist_remove(ignores, rec);
if (send_signal) {
if (!rec->autoignore) if (!rec->autoignore)
signal_emit("ignore destroyed", 1, rec); signal_emit("ignore destroyed", 1, rec);
else else
signal_emit("autoignore destroyed", 1, rec); signal_emit("autoignore destroyed", 1, rec);
}
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
if (rec->regexp_compiled) regfree(&rec->preg); if (rec->regexp_compiled) regfree(&rec->preg);
@ -377,7 +364,7 @@ void ignore_update_rec(IGNORE_REC *rec)
if (rec->level == 0) { if (rec->level == 0) {
/* unignored everything */ /* unignored everything */
ignore_remove_config(rec); ignore_remove_config(rec);
ignore_destroy(rec); ignore_destroy(rec, TRUE);
} else { } else {
/* unignore just some levels.. */ /* unignore just some levels.. */
ignore_remove_config(rec); ignore_remove_config(rec);
@ -405,7 +392,7 @@ static void read_ignores(void)
GSList *tmp; GSList *tmp;
while (ignores != NULL) while (ignores != NULL)
ignore_destroy(ignores->data); ignore_destroy(ignores->data, FALSE);
node = iconfig_node_traverse("ignores", FALSE); node = iconfig_node_traverse("ignores", FALSE);
if (node == NULL) { if (node == NULL) {
@ -486,7 +473,7 @@ void ignore_init(void)
void ignore_deinit(void) void ignore_deinit(void)
{ {
while (ignores != NULL) while (ignores != NULL)
ignore_destroy(ignores->data); ignore_destroy(ignores->data, TRUE);
nickmatch_deinit(nickmatch); nickmatch_deinit(nickmatch);
signal_remove("setup reread", (SIGNAL_FUNC) read_ignores); signal_remove("setup reread", (SIGNAL_FUNC) read_ignores);

2
src/core/ignore.h
View File

@ -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); 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_add_rec(IGNORE_REC *rec);
void ignore_update_rec(IGNORE_REC *rec); void ignore_update_rec(IGNORE_REC *rec);

15
src/fe-common/core/fe-ignore.c
View File

@ -29,6 +29,21 @@
#include "ignore.h" #include "ignore.h"
#include "printtext.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) static void ignore_print(int index, IGNORE_REC *rec)
{ {
GString *options; GString *options;