jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Move the autolog_ignore_targets logic a bit around; fixes #673.

Browse Source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5080 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Alexander Færøy 2009-07-22 19:45:51 +00:00 committed by ahf
parent 13edcc2ad1
commit 7b81897287
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fe-common/core/fe-log.c
View File

@ -460,10 +460,13 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
g_free(fname); g_free(fname);
} }
static void autolog_open_check(SERVER_REC *server, const char *server_tag, static void autolog_open_check(TEXT_DEST_REC *dest)
const char *target, int level)
{ {
const char *deftarget; const char *deftarget;
SERVER_REC *server = dest->server;
const char *server_tag = dest->server_tag;
const char *target = dest->target;
int level = dest->level;
/* FIXME: kind of a kludge, but we don't want to reopen logs when /* FIXME: kind of a kludge, but we don't want to reopen logs when
we're parting the channel with /WINDOW CLOSE.. Maybe a small we're parting the channel with /WINDOW CLOSE.. Maybe a small
@ -475,6 +478,10 @@ static void autolog_open_check(SERVER_REC *server, const char *server_tag,
deftarget = server ? server->nick : "unknown"; deftarget = server ? server->nick : "unknown";
if (autolog_ignore_targets != NULL &&
strarray_find_dest(autolog_ignore_targets, dest))
return;
if (target != NULL) if (target != NULL)
autolog_open(server, server_tag, strcmp(target, "*") ? target : deftarget); autolog_open(server, server_tag, strcmp(target, "*") ? target : deftarget);
} }
@ -504,13 +511,8 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
if (dest->level == MSGLEVEL_NEVER) if (dest->level == MSGLEVEL_NEVER)
return; return;
if (autolog_ignore_targets != NULL && dest->target != NULL)
if (strarray_find_dest(autolog_ignore_targets, dest))
return;
/* let autolog open the log records */ /* let autolog open the log records */
autolog_open_check(dest->server, dest->server_tag, autolog_open_check(dest);
dest->target, dest->level);
if (logs == NULL) if (logs == NULL)
return; return;