diff options
| author | Valentin Batz <senneth@irssi.org> | 2005-01-12 16:40:44 +0000 |
|---|---|---|
| committer | vb <vb@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2005-01-12 16:40:44 +0000 |
| commit | b5f93b6164da0b18090e3cee01a3ac31eb96709b (patch) | |
| tree | 5b5d689c7e570c5753b0ca3b92b106a6345fedba | |
| parent | f4c1b605edc2801b7d06f4117add4467119d1d05 (diff) | |
| download | irssi-b5f93b6164da0b18090e3cee01a3ac31eb96709b.zip | |
call setlocale(LC_ALL, ) once in fe-text/irssi.c and not everytime recode_get_charset() is called in recode.c
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3703 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/recode.c | 6 | ||||
| -rw-r--r-- | src/fe-text/irssi.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/recode.c b/src/core/recode.c index 95060e91..e073169e 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -25,8 +25,6 @@ #include "lib-config/iconfig.h" #include "misc.h" -#include <locale.h> - #ifdef HAVE_GLIB2 static gboolean recode_get_charset(const char **charset) { @@ -34,9 +32,7 @@ static gboolean recode_get_charset(const char **charset) if (**charset) /* we use the same test as in src/fe-text/term.c:123 */ return !g_strcasecmp(*charset, "utf-8"); - - /* we have to set LC_ALL to "" to get the charset of the user */ - setlocale(LC_ALL, ""); + return g_get_charset(charset); } #endif diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index 4064025b..3515fc57 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -362,6 +362,10 @@ int main(int argc, char **argv) of UTF-8 currently.. */ setlocale(LC_CTYPE, ""); + /* to get the users's charset with g_get_charset() properly you have + to call setlocale(LC_ALL, "") aswell */ + setlocale(LC_ALL, ""); + textui_init(); args_register(options); args_execute(argc, argv); |