correctly handle UTF-8 input text in the text info dialog (Fixes bug
2007-05-27 Lucas Rocha <lucasr@gnome.org> * src/text.c: correctly handle UTF-8 input text in the text info dialog (Fixes bug #407275). svn path=/trunk/; revision=1220
This commit is contained in:
parent
b73e72bcfe
commit
5868adac75
@ -1,3 +1,8 @@
|
|||||||
|
2007-05-27 Lucas Rocha <lucasr@gnome.org>
|
||||||
|
|
||||||
|
* src/text.c: correctly handle UTF-8 input text in the text info
|
||||||
|
dialog (Fixes bug #407275).
|
||||||
|
|
||||||
2007-05-27 Lucas Rocha <lucasr@gnome.org>
|
2007-05-27 Lucas Rocha <lucasr@gnome.org>
|
||||||
|
|
||||||
* src/main.c: initialize GTK+ before parsing command line options to
|
* src/main.c: initialize GTK+ before parsing command line options to
|
||||||
|
11
src/text.c
11
src/text.c
@ -74,9 +74,14 @@ zenity_text_handle_stdin (GIOChannel *channel,
|
|||||||
gsize utflen;
|
gsize utflen;
|
||||||
|
|
||||||
gtk_text_buffer_get_end_iter (buffer, &end);
|
gtk_text_buffer_get_end_iter (buffer, &end);
|
||||||
utftext = g_convert_with_fallback (buf, len, "UTF-8", "ISO-8859-1", NULL, &localelen, &utflen, NULL);
|
|
||||||
gtk_text_buffer_insert (buffer, &end, utftext, utflen);
|
if (!g_utf8_validate (buf, len, NULL)) {
|
||||||
g_free (utftext);
|
utftext = g_convert_with_fallback (buf, len, "UTF-8", "ISO-8859-1", NULL, &localelen, &utflen, NULL);
|
||||||
|
gtk_text_buffer_insert (buffer, &end, utftext, utflen);
|
||||||
|
g_free (utftext);
|
||||||
|
} else {
|
||||||
|
gtk_text_buffer_insert (buffer, &end, buf, len);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user