# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1170344095 0
# Node ID 48f3837a9625c6aa685be571ca9d2c2ba9bf799a
# Parent  5551adcf8f976fc4bcd7aacf84af23aee0b84350
Port [18176] from markhuetsch: Apparently GBK is old and we should be using GB18030.

Hopefully this fixes bugs 1625210, 1619225, and 1562372.

diff -r 5551adcf8f97 -r 48f3837a9625 libpurple/protocols/qq/char_conv.c
--- 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 */
diff -r 5551adcf8f97 -r 48f3837a9625 libpurple/protocols/qq/char_conv.h
--- 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);