diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-11-10 11:59:31 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-11-10 11:59:31 +0000 |
| commit | 7b529aa53035d49093a861e7a7d031c389a496ce (patch) | |
| tree | 15b754b0381aed3c00c44c7aad8f280f059b2546 /src/fe-text | |
| parent | 04ea54a1a090dc2699cd7e623c83d930a8ff5e2f (diff) | |
| download | irssi-7b529aa53035d49093a861e7a7d031c389a496ce.zip | |
Remove get_utf8_char/utf16_char_to_utf8 in favour of glib
g_utf8_get_char_validated/g_unichar_to_utf8.
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4893 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-text')
| -rw-r--r-- | src/fe-text/gui-readline.c | 4 | ||||
| -rw-r--r-- | src/fe-text/term-terminfo.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 65e35268..30e92fb7 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -295,7 +295,7 @@ static void paste_send(void) active_win->active); g_string_truncate(str, 0); } else if (active_entry->utf8) { - out[utf16_char_to_utf8(arr[i], out)] = '\0'; + out[g_unichar_to_utf8(arr[i], out)] = '\0'; g_string_append(str, out); } else if (term_type == TERM_TYPE_BIG5) { if (arr[i] > 0xff) @@ -490,7 +490,7 @@ static void sig_gui_key_pressed(gpointer keyp) } } else { /* need to convert to utf8 */ - str[utf16_char_to_utf8(key, str)] = '\0'; + str[g_unichar_to_utf8(key, str)] = '\0'; } if (strcmp(str, "^") == 0) { diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c index 03087949..7cf61e20 100644 --- a/src/fe-text/term-terminfo.c +++ b/src/fe-text/term-terminfo.c @@ -389,7 +389,7 @@ static void term_addch_utf8(TERM_WINDOW *window, unichar chr) char buf[10]; int i, len; - len = utf16_char_to_utf8(chr, buf); + len = g_unichar_to_utf8(chr, buf); for (i = 0; i < len; i++) putc(buf[i], window->term->out); } |