mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Query nick tracking: don't change query's nick if both the old and new nicks
exist in one channel. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2860 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
ea24fe9aeb
commit
e1b4a2ff8e
@ -42,6 +42,22 @@ static QUERY_REC *query_find_address(SERVER_REC *server, const char *address)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int have_channel_with_nicks(SERVER_REC *server, const char *nick1,
|
||||||
|
const char *nick2)
|
||||||
|
{
|
||||||
|
GSList *tmp;
|
||||||
|
|
||||||
|
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
|
||||||
|
CHANNEL_REC *channel = tmp->data;
|
||||||
|
|
||||||
|
if (nicklist_find(channel, nick1) != NULL &&
|
||||||
|
nicklist_find(channel, nick2) != NULL)
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
static void event_privmsg(SERVER_REC *server, const char *data,
|
static void event_privmsg(SERVER_REC *server, const char *data,
|
||||||
const char *nick, const char *address)
|
const char *nick, const char *address)
|
||||||
{
|
{
|
||||||
@ -59,8 +75,13 @@ static void event_privmsg(SERVER_REC *server, const char *data,
|
|||||||
address. it was probably a nick change or reconnect to
|
address. it was probably a nick change or reconnect to
|
||||||
server, so rename the query. */
|
server, so rename the query. */
|
||||||
query = query_find_address(server, address);
|
query = query_find_address(server, address);
|
||||||
if (query != NULL)
|
if (query != NULL) {
|
||||||
query_change_nick(query, nick);
|
/* make sure the old and new nicks aren't on the
|
||||||
|
same channel - happens with eg. www gateways
|
||||||
|
and such.. */
|
||||||
|
if (!have_channel_with_nicks(server, nick, query->name))
|
||||||
|
query_change_nick(query, nick);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user