zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 16:42:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Compare channels/networks fields case-insensitively

Browse source 
Fixes #856
This commit is contained in:
LemonBoy 2018-03-08 20:35:00 +01:00
commit fb9f5174c2
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/channels-setup.c
View file

@ -37,9 +37,14 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
name = config_node_get_str(node, "name", NULL); name = config_node_get_str(node, "name", NULL);
chatnet = config_node_get_str(node, "chatnet", NULL); chatnet = config_node_get_str(node, "chatnet", NULL);
if (g_strcmp0(name, channel->name) != 0 || if (name == NULL || chatnet == NULL) {
g_strcmp0(chatnet, channel->chatnet) != 0) return 0;
}
if (g_ascii_strcasecmp(name, channel->name) != 0 ||
g_ascii_strcasecmp(chatnet, channel->chatnet) != 0) {
return 1; return 1;
}
return 0; return 0;
} }

7
src/core/servers-setup.c
View file

@ -474,10 +474,15 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
chatnet = config_node_get_str(node, "chatnet", NULL); chatnet = config_node_get_str(node, "chatnet", NULL);
port = config_node_get_int(node, "port", 0); port = config_node_get_int(node, "port", 0);
if (address == NULL || chatnet == NULL) {
return 0;
}
if (g_strcmp0(address, server->address) != 0 || if (g_strcmp0(address, server->address) != 0 ||
g_strcmp0(chatnet, server->chatnet) != 0 || g_strcmp0(chatnet, server->chatnet) != 0 ||
port != server->port) port != server->port) {
return 1; return 1;
}
return 0; return 0;
} }