Mercurial > pidgin
diff libpurple/protocols/oscar/encoding.h @ 30386:ca90b6c27eb8
Refactored oscar_encoding_to_utf8().
1. Removed elb's hack from #1645. It doesn't appear to be necessary
anymore, since the recent official clients (6.5, 7.1) aren't that stupid
now.
2. Simplified logic in incomingim_chan2().
3. Removed all NULL return check for oscar_encoding_to_utf8(), because
it will always return non-NULL value.
author | ivan.komarov@soc.pidgin.im |
---|---|
date | Wed, 28 Jul 2010 16:30:04 +0000 |
parents | 9d386bf63eab |
children | 5661f30d1b8e |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/encoding.h Tue Jul 27 21:17:01 2010 +0000 +++ b/libpurple/protocols/oscar/encoding.h Wed Jul 28 16:30:04 2010 +0000 @@ -29,14 +29,7 @@ */ guint16 oscar_charset_check(const char *utf8); -/** - * Take a string of the form charset="bleh" where bleh is - * one of us-ascii, utf-8, iso-8859-1, or unicode-2-0, and - * return a newly allocated string containing bleh. - */ -gchar * oscar_encoding_extract(const char *encoding); - -gchar * oscar_encoding_to_utf8(PurpleAccount *account, const char *encoding, const char *text, int textlen); +gchar * oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen); gchar * oscar_utf8_try_convert(PurpleAccount *account, OscarData *od, const gchar *msg); /**