mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
"channel wholist" still wasn't sent at proper times.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2188 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
09b380536f
commit
5f7774db81
@ -443,13 +443,14 @@ 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, **channels;
|
||||||
int failed, multiple;
|
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);
|
||||||
multiple = strchr(channel, ',') != NULL;
|
multiple = strchr(channel, ',') != NULL;
|
||||||
|
channels = g_strsplit(channel, ",", -1);
|
||||||
|
|
||||||
failed = FALSE;
|
failed = FALSE;
|
||||||
rec = server->chanqueries;
|
rec = server->chanqueries;
|
||||||
@ -457,20 +458,23 @@ 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 (strarray_find(channels, chanrec->name) == -1)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (chanrec->ownnick->host == NULL && multiple &&
|
if (chanrec->ownnick->host == NULL && multiple &&
|
||||||
!server->one_endofwho) {
|
!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 if (chanrec->ownnick->host != NULL ||
|
} else {
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_strfreev(channels);
|
||||||
if (multiple)
|
if (multiple)
|
||||||
server->one_endofwho = TRUE;
|
server->one_endofwho = TRUE;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user