liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use g_setenv() and g_getenv() in setGtkLanguage(), #4319

Browse Source
This commit is contained in:
heckflosse 2018-02-09 21:01:59 +01:00
parent ab47193d8b
commit 786b73b899
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/multilangmgr.cc
View File

@ -19,6 +19,7 @@
#include "multilangmgr.h" #include "multilangmgr.h"
#include <fstream> #include <fstream>
#include <glib.h>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
@ -115,9 +116,9 @@ const LocaleToLang localeToLang;
void setGtkLanguage(const Glib::ustring &language) void setGtkLanguage(const Glib::ustring &language)
{ {
std::string lang = localeToLang.getLocale(language); std::string lang = localeToLang.getLocale(language);
char *env_langc = getenv("LANG"); const gchar *env_langc = g_getenv("LANG");
if(env_langc) { if(env_langc) {
std::string env_lang(env_langc); const std::string env_lang(env_langc);
if (!env_lang.empty()) { if (!env_lang.empty()) {
const std::string::size_type suffix_pos = env_lang.find_first_of("."); const std::string::size_type suffix_pos = env_lang.find_first_of(".");
if (suffix_pos != std::string::npos) { if (suffix_pos != std::string::npos) {
@ -126,11 +127,7 @@ void setGtkLanguage(const Glib::ustring &language)
} }
} }
#ifdef WIN32 g_setenv("LANG", lang.c_str(), true);
putenv(("LANG=" + lang).c_str());
#else
setenv("LANG", lang.c_str(), true);
#endif
} }
} }