zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 20:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use g_get_charset to retrieve the locale codeset.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4821 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-05-14 08:58:04 +00:00 • committed by exg
commit b44bcd68cb
2 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/fe-common/core/fe-recode.c
View file

@ -29,10 +29,6 @@
#include "formats.h"
#include "recode.h"
#ifdef HAVE_NL_LANGINFO
# include <langinfo.h>
#endif
static char *recode_fallback = NULL;
static char *recode_out_default = NULL;
static char *term_charset = NULL;
@ -172,14 +168,11 @@ static void read_settings(void)
g_free(term_charset);
term_charset = g_strdup(settings_get_str("term_charset"));
if (!is_valid_charset(term_charset)) {
const char *str;
g_free(term_charset);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) :
*nl_langinfo(CODESET) != '\0' ? g_strdup(nl_langinfo(CODESET)) :
"ISO8859-1";
#else
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : "ISO8859-1";
#endif
g_get_charset(&str);
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : g_strdup(str);
settings_set_str("term_charset", term_charset);
/* FIXME: move the check of term_charset into fe-text/term.c
it breaks the proper term_input_type