# HG changeset patch
# User mterry@ubuntu.com
# Date 1293589930 0
# Node ID 3a94faf350c74f487fa9bfe1020b69febf881585
# Parent  37c9f6020c358a45c5f4bb911bfbaf3f7a00c522
Make QQ 2008 the default QQ protocol version.  Fixes #11635.

committer: John Bailey <rekkanoryo@rekkanoryo.org>

diff -r 37c9f6020c35 -r 3a94faf350c7 ChangeLog
--- a/ChangeLog	Tue Dec 28 11:34:19 2010 +0000
+++ b/ChangeLog	Wed Dec 29 02:32:10 2010 +0000
@@ -14,6 +14,9 @@
 	* The Voice/Video Settings plugin no longer resets selected devices to
 	  defaults. (Jakub Adam) (#13044)
 
+	QQ:
+	* QQ2008 is now the default protocol version. (Michael Terry) (#11635)
+
 version 2.7.9 (12/26/2010):
 	MSN:
 	* Fix a crash when receiving short packets related to P2Pv2. (CVE ID
diff -r 37c9f6020c35 -r 3a94faf350c7 libpurple/protocols/qq/qq.c
--- a/libpurple/protocols/qq/qq.c	Tue Dec 28 11:34:19 2010 +0000
+++ b/libpurple/protocols/qq/qq.c	Wed Dec 29 02:32:10 2010 +0000
@@ -157,15 +157,15 @@
 	purple_debug_info("QQ", "Server list has %d\n", g_list_length(qd->servers));
 
 	version_str = purple_account_get_string(account, "client_version", NULL);
-	qd->client_tag = QQ_CLIENT_0D55;	/* set default as QQ2005 */
-	qd->client_version = 2005;
+	qd->client_tag = QQ_CLIENT_115B;	/* set default as QQ2008 */
+	qd->client_version = 2008;
 	if (version_str != NULL && strlen(version_str) != 0) {
-		if (strcmp(version_str, "qq2007") == 0) {
+		if (strcmp(version_str, "qq2005") == 0) {
+			qd->client_tag = QQ_CLIENT_0D55;
+			qd->client_version = 2005;
+		} else if (strcmp(version_str, "qq2007") == 0) {
 			qd->client_tag = QQ_CLIENT_111D;
 			qd->client_version = 2007;
-		} else if (strcmp(version_str, "qq2008") == 0) {
-			qd->client_tag = QQ_CLIENT_115B;
-			qd->client_version = 2008;
 		}
 	}
 
@@ -1113,8 +1113,8 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	kvp = g_new0(PurpleKeyValuePair, 1);
-	kvp->key = g_strdup(_("QQ2005"));
-	kvp->value = g_strdup("qq2005");
+	kvp->key = g_strdup(_("QQ2008"));
+	kvp->value = g_strdup("qq2008");
 	version_kv_list = g_list_append(version_kv_list, kvp);
 
 	kvp = g_new0(PurpleKeyValuePair, 1);
@@ -1123,8 +1123,8 @@
 	version_kv_list = g_list_append(version_kv_list, kvp);
 
 	kvp = g_new0(PurpleKeyValuePair, 1);
-	kvp->key = g_strdup(_("QQ2008"));
-	kvp->value = g_strdup("qq2008");
+	kvp->key = g_strdup(_("QQ2005"));
+	kvp->value = g_strdup("qq2005");
 	version_kv_list = g_list_append(version_kv_list, kvp);
 
 	option = purple_account_option_list_new(_("Client Version"), "client_version", version_kv_list);