diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2006-09-20 23:04:40 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2006-09-20 23:04:40 +0000 |
| commit | 3cdf50170ff5117a3d250ea04477ebdbc1d4bbba (patch) | |
| tree | 52a4e334ca8d1167131add5db921350d28a9469d /src/fe-common | |
| parent | 6e3870af5cbe1fa736469f0124fa83c871d7dd0a (diff) | |
| download | irssi-3cdf50170ff5117a3d250ea04477ebdbc1d4bbba.zip | |
Add public is_utf8 function by refactoring existing code.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4368 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/formats.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 3fcb8066..ccfad968 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -33,6 +33,7 @@ #include "themes.h" #include "translation.h" #ifdef HAVE_GLIB2 +#include "recode.h" #include "utf8.h" #endif @@ -299,17 +300,6 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server, window_find_closest(server, target, level); } #ifdef HAVE_GLIB2 -static gboolean term_is_utf8 (void) -{ - const char *charset; - - charset = settings_get_str("term_charset"); - if (*charset) - return ! g_strcasecmp(charset, "utf-8"); - - return g_get_charset(&charset); -} - static int advance (char const **str, gboolean utf8) { if (utf8) { @@ -338,7 +328,7 @@ int format_get_length(const char *str) g_return_val_if_fail(str != NULL, 0); #ifdef HAVE_GLIB2 - utf8 = term_is_utf8() && g_utf8_validate(str, -1, NULL); + utf8 = is_utf8() && g_utf8_validate(str, -1, NULL); #endif tmp = g_string_new(NULL); @@ -382,7 +372,7 @@ int format_real_length(const char *str, int len) g_return_val_if_fail(len >= 0, 0); #ifdef HAVE_GLIB2 - utf8 = term_is_utf8() && g_utf8_validate(str, -1, NULL); + utf8 = is_utf8() && g_utf8_validate(str, -1, NULL); #endif start = str; |