Mercurial > pidgin
changeset 30898:e9e41a04513d
merge of '5e579d58062410991f6268b66906fb7434730423'
and '7eb555d9d20df94a7bef577253c8effb724ab484'
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Tue, 02 Nov 2010 20:51:44 +0000 |
| parents | a2e2d351f6fb (diff) 2d029c5cd305 (current diff) |
| children | 56e1f06471a9 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/encoding.c Tue Nov 02 02:06:13 2010 +0000 +++ b/libpurple/protocols/oscar/encoding.c Tue Nov 02 20:51:44 2010 +0000 @@ -61,7 +61,6 @@ } else if (!g_ascii_strcasecmp(extracted_encoding, "unicode-2-0")) { glib_encoding = "UTF-16BE"; } else if (g_ascii_strcasecmp(extracted_encoding, "utf-8")) { - purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", attempting to convert to UTF-8 anyway\n", extracted_encoding); glib_encoding = extracted_encoding; }