changeset
Port [18176] from markhuetsch: Apparently GBK is old and we should be using GB18030.
Thu, 01 Feb 2007 15:34:55 +0000
- author
- Evan Schoenberg <evands@pidgin.im>
- date
- Thu, 01 Feb 2007 15:34:55 +0000
- changeset 15540
- fb1766fe5155
- parent 15539
- b204042fba24
- child 15541
- d5974476ce3a
Port [18176] from markhuetsch: Apparently GBK is old and we should be using GB18030.
Hopefully this fixes bugs 1625210, 1619225, and 1562372.
| libpurple/protocols/qq/char_conv.c | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/qq/char_conv.h | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/qq/char_conv.c Thu Feb 01 00:37:13 2007 +0000 +++ b/libpurple/protocols/qq/char_conv.c Thu Feb 01 15:34:55 2007 +0000 @@ -33,7 +33,7 @@ #define QQ_SMILEY_AMOUNT 96 #define UTF8 "UTF-8" -#define QQ_CHARSET_ZH_CN "GBK" +#define QQ_CHARSET_ZH_CN "GB18030" #define QQ_CHARSET_ENG "ISO-8859-1" #define QQ_NULL_MSG "(NULL)" /* return this if conversion fails */
--- a/libpurple/protocols/qq/char_conv.h Thu Feb 01 00:37:13 2007 +0000 +++ b/libpurple/protocols/qq/char_conv.h Thu Feb 01 15:34:55 2007 +0000 @@ -27,7 +27,7 @@ #include <glib.h> -#define QQ_CHARSET_DEFAULT "GBK" +#define QQ_CHARSET_DEFAULT "GB18030" gint convert_as_pascal_string(guint8 *data, gchar **ret, const gchar *from_charset);
