summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémie Courrèges-Anglas <jca@wxcvbn.org>2017-09-17 20:01:15 +0200
committerJérémie Courrèges-Anglas <jca@wxcvbn.org>2017-09-17 20:01:15 +0200
commit34859e1fe9959778b964c9de457f192c5e369705 (patch)
tree49c82a678554c323523a4c7bf82f62f262d28d77
parentd276a2199fa5ca02e8d7e4a4d4c952ca008485e5 (diff)
downloadratpoison-34859e1fe9959778b964c9de457f192c5e369705.zip
Initialize utf8_locale in main(), it doesn't belong in defaults now
-rw-r--r--src/main.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index af1bc7d..fa49784 100644
--- a/src/main.c
+++ b/src/main.c
@@ -267,12 +267,6 @@ init_defaults (void)
set_extents_of_fontset (defaults.font);
#endif
-#ifdef HAVE_LANGINFO_CODESET
- utf8_locale = !strcmp (nl_langinfo (CODESET), "UTF-8");
-#endif
- PRINT_DEBUG (("UTF-8 locale detected: %s\n",
- utf8_locale ? "yes" : "no"));
-
defaults.fgcolor_string = xstrdup ("black");
defaults.bgcolor_string = xstrdup ("white");
defaults.fwcolor_string = xstrdup ("black");
@@ -315,6 +309,10 @@ main (int argc, char *argv[])
else
PRINT_ERROR (("X doesn't seem to support your locale.\n"));
+#ifdef HAVE_LANGINFO_CODESET
+ utf8_locale = !strcmp (nl_langinfo (CODESET), "UTF-8");
+#endif
+
/* Parse the arguments */
myargv = argv;
while (1)