summaryrefslogtreecommitdiff
path: root/src/fe-common/core
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2008-06-06 22:19:57 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2008-06-06 22:19:57 +0000
commit8c482d03a9956c2d285244144e85be5c77f4385e (patch)
treebf4f419cf439785f95344a978a34c9c580a65daf /src/fe-common/core
parent1aa6cbc3f9826f006f77dd0865ca72b5ac8aedf7 (diff)
downloadirssi-8c482d03a9956c2d285244144e85be5c77f4385e.zip
Pass NULL to settings_set_str to reset term_charset to its default
value rather than hardcoding the string. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4859 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core')
-rw-r--r--src/fe-common/core/fe-recode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c
index be7c6b53..f0ce6da9 100644
--- a/src/fe-common/core/fe-recode.c
+++ b/src/fe-common/core/fe-recode.c
@@ -168,11 +168,8 @@ 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);
- g_get_charset(&str);
- term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : g_strdup(str);
+ term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : NULL;
settings_set_str("term_charset", term_charset);
}