diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-03-15 12:58:20 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-03-15 12:58:20 +0000 |
| commit | 074b1218588fa924bd7bb2e11f1a3f7e0dd016e3 (patch) | |
| tree | ce09d409f1ab264c12e790a66e46c7ddf424f39b /src/fe-common/core/fe-recode.c | |
| parent | d42073c590ee94c53670c86f1b9c0bfb5a36c248 (diff) | |
| download | irssi-074b1218588fa924bd7bb2e11f1a3f7e0dd016e3.zip | |
Remove trailing whitespace.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4769 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core/fe-recode.c')
| -rw-r--r-- | src/fe-common/core/fe-recode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c index 203e69f7..58bd7ad5 100644 --- a/src/fe-common/core/fe-recode.c +++ b/src/fe-common/core/fe-recode.c @@ -180,24 +180,24 @@ static void read_settings(void) if (!is_valid_charset(term_charset)) { 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)) : + 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 +#endif 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 + /* FIXME: move the check of term_charset into fe-text/term.c + it breaks the proper term_input_type setup and reemitting of the signal is kludgy */ if (g_strcasecmp(term_charset, old_term_charset) != 0) signal_emit("setup changed", 0); } - + if (recode_out_default) g_free(recode_out_default); recode_out_default = g_strdup(settings_get_str("recode_out_default_charset")); - if (recode_out_default != NULL && *recode_out_default != '\0' && + if (recode_out_default != NULL && *recode_out_default != '\0' && !is_valid_charset(recode_out_default)) { signal_emit("error command", 2, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_out_default); g_free(recode_out_default); |