From 789f8a6b51ebdd7cb6ba5c902c02e5a44a71ed68 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 11 Sep 2017 10:20:46 +0200 Subject: [PATCH] libnm-core: also consider LC_ALL and LC_CTYPE to guess SSID charset Also consider LC_ALL and LC_CTYPE environment variables, in addition to LANG, to determine the charset used for converting SSIDs to UTF-8. https://bugzilla.gnome.org/show_bug.cgi?id=784415 --- libnm-core/nm-utils.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index a234fe909..9133af57d 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -201,8 +201,13 @@ get_system_encodings (void) if (cached_encodings) return cached_encodings; - /* LANG may be a good encoding hint */ - if ((lang = getenv ("LANG"))) { + /* Use environment variables as encoding hint */ + lang = getenv ("LC_ALL"); + if (!lang) + lang = getenv ("LC_CTYPE"); + if (!lang) + lang = getenv ("LANG"); + if (lang) { char *dot; lang = g_ascii_strdown (lang, -1);