aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Merge pull request #577 from LemonBoy/flagz

Browse Source 
Minor corrections to the netsplit code.
This commit is contained in:
LemonBoy 2016-11-25 21:52:42 +01:00 committed by GitHub
commit 22ce6637c7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fe-common/irc/fe-netjoin.c
View File

@ -164,7 +164,7 @@ static void print_channel_netjoins(char *channel, TEMP_PRINT_REC *rec,
g_free(channel);
}
static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channel)
{
TEMP_PRINT_REC *temp;
GHashTable *channels;
@ -189,7 +189,9 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
next2 = g_slist_next(tmp2);
if (channel != NULL && strcasecmp(realchannel, channel) != 0)
/* Filter the results by channel if asked to do so */
if (filter_channel != NULL &&
strcasecmp(realchannel, filter_channel) != 0)
continue;
temp = g_hash_table_lookup(channels, realchannel);
@ -251,7 +253,7 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
if (!IS_IRC_SERVER(dest->server))
return;
if (dest->level != MSGLEVEL_PUBLIC)
if (!(dest->level & MSGLEVEL_PUBLIC))
return;
if (!server_ischannel(dest->server, dest->target))

11
src/fe-common/irc/fe-netsplit.c
View File

@ -142,7 +142,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
}
}
static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *channel)
static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *filter_channel)
{
GString *destservers;
char *sourceserver;
@ -168,7 +168,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con
for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) {
TEMP_SPLIT_CHAN_REC *chan = tmp->data;
if (channel != NULL && strcasecmp(channel, chan->name) != 0)
if (filter_channel != NULL &&
strcasecmp(chan->name, filter_channel) != 0)
continue;
g_string_truncate(chan->nicks, chan->nicks->len-2);
@ -249,13 +250,13 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
if (printing_splits)
return;
if (IS_IRC_SERVER(dest->server) == FALSE)
if (!IS_IRC_SERVER(dest->server))
return;
if (dest->level != MSGLEVEL_PUBLIC)
if (!(dest->level & MSGLEVEL_PUBLIC))
return;
if (server_ischannel(dest->server, dest->target) == FALSE)
if (!server_ischannel(dest->server, dest->target))
return;
rec = IRC_SERVER(dest->server);