From: Ran Benita <ran234@gmail.com>
Date: Sun, 13 Aug 2017 15:06:04 +0000 (+0300)
Subject: Change the locale discovery procedure to treat empty string same as unset
X-Git-Tag: 2.10~7^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F140%2Fhead;p=i3%2Fi3lock

Change the locale discovery procedure to treat empty string same as unset

This is explained in the commit message here:
https://github.com/xkbcommon/libxkbcommon/commit/f468f0b2430e15cc262c5745445580bd0dc64ef0
---

diff --git a/i3lock.c b/i3lock.c
index 87a77b1..208e4ac 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -977,11 +977,11 @@ int main(int argc, char *argv[]) {
         errx(EXIT_FAILURE, "Could not load keymap");
 
     const char *locale = getenv("LC_ALL");
-    if (!locale)
+    if (!locale || !*locale)
         locale = getenv("LC_CTYPE");
-    if (!locale)
+    if (!locale || !*locale)
         locale = getenv("LANG");
-    if (!locale) {
+    if (!locale || !*locale) {
         if (debug_mode)
             fprintf(stderr, "Can't detect your locale, fallback to C\n");
         locale = "C";