diff options
| author | LemonBoy <LemonBoy@users.noreply.github.com> | 2016-11-25 21:52:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 21:52:42 +0100 |
| commit | 22ce6637c7acbdda27395521cc7dce23fa98b8b9 (patch) | |
| tree | 32ccb5f2017c7eedcdf0ad568849ef5d6602d533 /src | |
| parent | 1c0f048d2cc0184105f6e2fff835be7efa633a7b (diff) | |
| parent | 5f0e755a00c7cb0e85e167cd455bb3ce16b4d14b (diff) | |
| download | irssi-22ce6637c7acbdda27395521cc7dce23fa98b8b9.zip | |
Merge pull request #577 from LemonBoy/flagz
Minor corrections to the netsplit code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/irc/fe-netjoin.c | 8 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-netsplit.c | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 22ca642c..4eb388c0 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -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)) diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index aa05639b..17fb1994 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -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); |