Mercurial > pidgin.yaz

changeset 15482:48f3837a9625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Port [18176] from markhuetsch: Apparently GBK is old and we should be using GB18030. Hopefully this fixes bugs 1625210, 1619225, and 1562372.
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 01 Feb 2007 15:34:55 +0000
parents 5551adcf8f97
children 0d43518fd943
files libpurple/protocols/qq/char_conv.c libpurple/protocols/qq/char_conv.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);