From 786b73b89985fbca34a51e4dbabd6b7a43f1ca5d Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 9 Feb 2018 21:01:59 +0100 Subject: [PATCH] use g_setenv() and g_getenv() in setGtkLanguage(), #4319 --- rtgui/multilangmgr.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 0bd0a13e3..50fdc71cc 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -19,6 +19,7 @@ #include "multilangmgr.h" #include +#include #ifdef WIN32 #include @@ -115,9 +116,9 @@ const LocaleToLang localeToLang; void setGtkLanguage(const Glib::ustring &language) { std::string lang = localeToLang.getLocale(language); - char *env_langc = getenv("LANG"); + const gchar *env_langc = g_getenv("LANG"); if(env_langc) { - std::string env_lang(env_langc); + const std::string env_lang(env_langc); if (!env_lang.empty()) { const std::string::size_type suffix_pos = env_lang.find_first_of("."); if (suffix_pos != std::string::npos) { @@ -126,11 +127,7 @@ void setGtkLanguage(const Glib::ustring &language) } } -#ifdef WIN32 - putenv(("LANG=" + lang).c_str()); -#else - setenv("LANG", lang.c_str(), true); -#endif + g_setenv("LANG", lang.c_str(), true); } }