pidgin.next.major: 807d1abb: Don't bother reading in the "protocol" a...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 807d1abbfdb467f3e6b995ae329f287a13a1b093
Parent:   40bc3caf7dac2e4ecf2db85a32eb99769c3269e3
Author:   markdoliner at pidgin.im
Date:     03/17/11 04:00:18
Branch:   im.pidgin.pidgin.next.major
URL: http://d.pidgin.im/viewmtn/revision/info/807d1abbfdb467f3e6b995ae329f287a13a1b093

Changelog: 

Don't bother reading in the "protocol" attribute in blist.xml.  As near as
I can tell we've been using "proto" in blist.xml since revision
3244f1796094ad1d67ecc4d685022b38a6c7e624 in October 2003.

Changes against parent 40bc3caf7dac2e4ecf2db85a32eb99769c3269e3

  patched  libpurple/blist.c

-------------- next part --------------
============================================================
--- libpurple/blist.c	b9ccf050f3cb57ad51d52b5cc2237fc291dbe392
+++ libpurple/blist.c	fbb83df9f079d77d52507a6ab7394bc0a2c9343d
@@ -460,17 +460,16 @@ parse_buddy(PurpleGroup *group, PurpleCo
 	PurpleAccount *account;
 	PurpleBuddy *buddy;
 	char *name = NULL, *alias = NULL;
-	const char *acct_name, *proto, *protocol;
+	const char *acct_name, *proto;
 	xmlnode *x;
 
 	acct_name = xmlnode_get_attrib(bnode, "account");
-	protocol = xmlnode_get_attrib(bnode, "protocol");
 	proto = xmlnode_get_attrib(bnode, "proto");
 
-	if (!acct_name || (!proto && !protocol))
+	if (!acct_name || !proto)
 		return;
 
-	account = purple_accounts_find(acct_name, proto ? proto : protocol);
+	account = purple_accounts_find(acct_name, proto);
 
 	if (!account)
 		return;
@@ -529,19 +528,18 @@ parse_chat(PurpleGroup *group, xmlnode *
 {
 	PurpleChat *chat;
 	PurpleAccount *account;
-	const char *acct_name, *proto, *protocol;
+	const char *acct_name, *proto;
 	xmlnode *x;
 	char *alias = NULL;
 	GHashTable *components;
 
 	acct_name = xmlnode_get_attrib(cnode, "account");
-	protocol = xmlnode_get_attrib(cnode, "protocol");
 	proto = xmlnode_get_attrib(cnode, "proto");
 
-	if (!acct_name || (!proto && !protocol))
+	if (!acct_name || !proto)
 		return;
 
-	account = purple_accounts_find(acct_name, proto ? proto : protocol);
+	account = purple_accounts_find(acct_name, proto);
 
 	if (!account)
 		return;
@@ -627,17 +625,16 @@ purple_blist_load()
 			xmlnode *x;
 			PurpleAccount *account;
 			int imode;
-			const char *acct_name, *proto, *mode, *protocol;
+			const char *acct_name, *proto, *mode;
 
 			acct_name = xmlnode_get_attrib(anode, "name");
-			protocol = xmlnode_get_attrib(anode, "protocol");
 			proto = xmlnode_get_attrib(anode, "proto");
 			mode = xmlnode_get_attrib(anode, "mode");
 
-			if (!acct_name || (!proto && !protocol) || !mode)
+			if (!acct_name || !proto || !mode)
 				continue;
 
-			account = purple_accounts_find(acct_name, proto ? proto : protocol);
+			account = purple_accounts_find(acct_name, proto);
 
 			if (!account)
 				continue;