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

"channel wholist" was sent to channels that hadn't received /WHO list yet.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2187 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-12-03 20:09:17 +00:00 committed by cras
parent 782ac81f2c
commit 09b380536f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/irc/core/channels-query.c
View File

@ -444,12 +444,12 @@ static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
SERVER_QUERY_REC *rec; SERVER_QUERY_REC *rec;
GSList *tmp, *next; GSList *tmp, *next;
char *params, *channel; char *params, *channel;
int failed; int failed, multiple;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = event_get_params(data, 2, NULL, &channel); params = event_get_params(data, 2, NULL, &channel);
server->one_endofwho = strchr(channel, ',') != NULL; multiple = strchr(channel, ',') != NULL;
failed = FALSE; failed = FALSE;
rec = server->chanqueries; rec = server->chanqueries;
@ -457,19 +457,24 @@ static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
IRC_CHANNEL_REC *chanrec = tmp->data; IRC_CHANNEL_REC *chanrec = tmp->data;
next = tmp->next; next = tmp->next;
if (chanrec->ownnick->host == NULL && !server->one_endofwho) { if (chanrec->ownnick->host == NULL && multiple &&
!server->one_endofwho) {
/* we should receive our own host for each channel. /* we should receive our own host for each channel.
However, some servers really are stupid enough However, some servers really are stupid enough
not to reply anything to /WHO requests.. */ not to reply anything to /WHO requests.. */
failed = TRUE; failed = TRUE;
} else { } else if (chanrec->ownnick->host != NULL ||
server->one_endofwho) {
chanrec->wholist = TRUE; chanrec->wholist = TRUE;
signal_emit("channel wholist", 1, chanrec); signal_emit("channel wholist", 1, chanrec);
channel_got_query(chanrec, CHANNEL_QUERY_WHO); channel_got_query(chanrec, CHANNEL_QUERY_WHO);
} }
} }
if (server->one_endofwho && failed) { if (multiple)
server->one_endofwho = TRUE;
if (failed) {
/* server didn't understand multiple WHO replies, /* server didn't understand multiple WHO replies,
send them again separately */ send them again separately */
query_current_error(server); query_current_error(server);