From 0d4f13d20f304927277ad327c714481bc97de48f Mon Sep 17 00:00:00 2001 From: David Hill Date: Tue, 10 Jun 2014 12:06:19 -0400 Subject: Replace deprecated g_str[n]casecmp with g_ascii_str[n]cmp. --- src/fe-common/irc/fe-events-numeric.c | 6 ++++-- src/fe-common/irc/fe-events.c | 4 ++-- src/fe-common/irc/fe-irc-queries.c | 2 +- src/fe-common/irc/fe-modes.c | 2 +- src/fe-common/irc/fe-netjoin.c | 2 +- src/fe-common/irc/fe-netsplit.c | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/fe-common/irc') diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index b6b6e8a8..d1cd12d4 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -336,8 +336,10 @@ static void event_away(IRC_SERVER_REC *server, const char *data) params = event_get_params(data, 3, NULL, &nick, &awaymsg); recoded = recode_in(SERVER(server), awaymsg, nick); if (!settings_get_bool("show_away_once") || - last_away_nick == NULL || g_strcasecmp(last_away_nick, nick) != 0 || - last_away_msg == NULL || g_strcasecmp(last_away_msg, awaymsg) != 0) { + last_away_nick == NULL || + g_ascii_strcasecmp(last_away_nick, nick) != 0 || + last_away_msg == NULL || + g_ascii_strcasecmp(last_away_msg, awaymsg) != 0) { /* don't show the same away message from the same nick all the time */ g_free_not_null(last_away_nick); diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index a6fd8599..5cde9e4b 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -209,7 +209,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data, params = event_get_params(data, 1, &newnick); /* NOTE: server->nick was already changed in irc/core/irc-nicklist.c */ - signal_emit(g_strcasecmp(newnick, server->nick) == 0 ? + signal_emit(g_ascii_strcasecmp(newnick, server->nick) == 0 ? "message own_nick" : "message nick", 4, server, newnick, sender, addr); @@ -330,7 +330,7 @@ static void event_connected(IRC_SERVER_REC *server) g_return_if_fail(server != NULL); nick = server->connrec->nick; - if (g_strcasecmp(server->nick, nick) == 0) + if (g_ascii_strcasecmp(server->nick, nick) == 0) return; /* someone has our nick, find out who. */ diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c index ec55a5db..0861c9e4 100644 --- a/src/fe-common/irc/fe-irc-queries.c +++ b/src/fe-common/irc/fe-irc-queries.c @@ -35,7 +35,7 @@ static QUERY_REC *query_find_address(SERVER_REC *server, const char *address) QUERY_REC *rec = tmp->data; if (*rec->name != '=' && rec->address != NULL && - g_strcasecmp(address, rec->address) == 0) + g_ascii_strcasecmp(address, rec->address) == 0) return rec; } diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c index 48a83515..027d7a76 100644 --- a/src/fe-common/irc/fe-modes.c +++ b/src/fe-common/irc/fe-modes.c @@ -184,7 +184,7 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel, chanrec = !group_multi_mode ? NULL : irc_channel_find(server, channel); - if (chanrec != NULL && g_strcasecmp(nick, server->nick) != 0) + if (chanrec != NULL && g_ascii_strcasecmp(nick, server->nick) != 0) msg_multi_mode(chanrec, nick, addr, mode); else { printformat(server, channel, MSGLEVEL_MODES, diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 35ee43f5..35c463e4 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -119,7 +119,7 @@ static NETJOIN_REC *netjoin_find(IRC_SERVER_REC *server, const char *nick) for (tmp = srec->netjoins; tmp != NULL; tmp = tmp->next) { NETJOIN_REC *rec = tmp->data; - if (g_strcasecmp(rec->nick, nick) == 0) + if (g_ascii_strcasecmp(rec->nick, nick) == 0) return rec; } diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index 788f6d00..3eb30796 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -73,7 +73,7 @@ static GSList *get_source_servers(const char *server, GSList **servers) NETSPLIT_SERVER_REC *rec = tmp->data; next = tmp->next; - if (g_strcasecmp(rec->server, server) == 0) { + if (g_ascii_strcasecmp(rec->server, server) == 0) { rec->prints = 0; list = g_slist_append(list, rec); *servers = g_slist_remove(*servers, rec); @@ -91,7 +91,7 @@ static TEMP_SPLIT_CHAN_REC *find_split_chan(TEMP_SPLIT_REC *rec, for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) { TEMP_SPLIT_CHAN_REC *chanrec = tmp->data; - if (g_strcasecmp(chanrec->name, name) == 0) + if (g_ascii_strcasecmp(chanrec->name, name) == 0) return chanrec; } @@ -292,7 +292,7 @@ static void sig_netsplit_servers(void) static int split_equal(NETSPLIT_REC *n1, NETSPLIT_REC *n2) { - return g_strcasecmp(n1->nick, n2->nick); + return g_ascii_strcasecmp(n1->nick, n2->nick); } static void split_get(void *key, NETSPLIT_REC *rec, GSList **list) -- cgit v1.2.3