mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
Netjoin should now work properly with +channels and !channels.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3104 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
4431f7c994
commit
6331a7f447
@ -184,8 +184,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
|
|||||||
next = tmp->next;
|
next = tmp->next;
|
||||||
while (rec->now_channels != NULL) {
|
while (rec->now_channels != NULL) {
|
||||||
char *channel = rec->now_channels->data;
|
char *channel = rec->now_channels->data;
|
||||||
char *realchannel = channel +
|
char *realchannel = channel + 1;
|
||||||
(isnickflag(*channel) && ischannel(channel[1]));
|
|
||||||
|
|
||||||
temp = g_hash_table_lookup(channels, realchannel);
|
temp = g_hash_table_lookup(channels, realchannel);
|
||||||
if (temp == NULL) {
|
if (temp == NULL) {
|
||||||
@ -198,7 +197,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
|
|||||||
|
|
||||||
temp->count++;
|
temp->count++;
|
||||||
if (temp->count <= netjoin_max_nicks) {
|
if (temp->count <= netjoin_max_nicks) {
|
||||||
if (isnickflag(*channel))
|
if (*channel != ' ')
|
||||||
g_string_append_c(temp->nicks,
|
g_string_append_c(temp->nicks,
|
||||||
*channel);
|
*channel);
|
||||||
g_string_sprintfa(temp->nicks, "%s, ",
|
g_string_sprintfa(temp->nicks, "%s, ",
|
||||||
@ -318,7 +317,7 @@ static void msg_join(IRC_SERVER_REC *server, const char *channel,
|
|||||||
netjoin = netjoin_add(server, nick, split->channels);
|
netjoin = netjoin_add(server, nick, split->channels);
|
||||||
|
|
||||||
netjoin->now_channels = g_slist_append(netjoin->now_channels,
|
netjoin->now_channels = g_slist_append(netjoin->now_channels,
|
||||||
g_strdup(channel));
|
g_strconcat(" ", channel, NULL));
|
||||||
signal_stop();
|
signal_stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user