pidgin: 1d5b0e62: Make QQ 2008 the default QQ protocol ver...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 1d5b0e623a9d1e2514a76266fb2bd5fd60537bd3
Parent:   83923425ae649610dc9a45a64e7aa2fe46aaaa40
Author:   mterry at ubuntu.com
Date:     12/28/10 21:32:10
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1d5b0e623a9d1e2514a76266fb2bd5fd60537bd3

Changelog: 

Make QQ 2008 the default QQ protocol version.  Fixes #11635.

Changes against parent 83923425ae649610dc9a45a64e7aa2fe46aaaa40

  patched  ChangeLog
  patched  libpurple/protocols/qq/qq.c

-------------- next part --------------
============================================================
--- ChangeLog	42468ae29f13bd6bc359d31fa1dc7738ecd7aceb
+++ ChangeLog	246a642e7db83d77e9052331bbadb0c5365bac10
@@ -14,6 +14,9 @@ version 2.7.10 (??/??/????):
 	* 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
============================================================
--- libpurple/protocols/qq/qq.c	74353a971feb3ad8664c10cfbdab988cf63902e5
+++ libpurple/protocols/qq/qq.c	79a58f0ba3f9e2a14e926e529d34e8e9797a9b77
@@ -157,15 +157,15 @@ static void qq_login(PurpleAccount *acco
 	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 @@ static void init_plugin(PurplePlugin *pl
 	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 @@ static void init_plugin(PurplePlugin *pl
 	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);