gobjectification: a286d462: Fix compilation problems that arose when...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: a286d462432a9682891be573a89b570a6c6d845f
Parent:   c99f1826090541b103082e638150f5a8aea294d2
Author:   markdoliner at pidgin.im
Date:     03/21/11 02:39:34
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/a286d462432a9682891be573a89b570a6c6d845f

Changelog: 

Fix compilation problems that arose when I propagated from next.major.
Mostly because functions were moved to different files for some reason,
I think?

Changes against parent c99f1826090541b103082e638150f5a8aea294d2

  patched  libpurple/accountlist.c
  patched  libpurple/buddy.c
  patched  libpurple/group.h

-------------- next part --------------
============================================================
--- libpurple/accountlist.c	00da92c491df3b6efb504edfb5d79f3527e5893f
+++ libpurple/accountlist.c	e4549ca6ae9c12e845863ab8c47f21adfe528803
@@ -466,7 +466,7 @@ parse_account(xmlnode *node)
 		return NULL;
 	}
 
-	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+	ret = purple_account_new(name, protocol_id);
 	g_free(name);
 	g_free(protocol_id);
 	if (!ret)
============================================================
--- libpurple/buddy.c	cd6d85a7b73b3d7f419e21e2265db20ee9451691
+++ libpurple/buddy.c	93f362ccef6d3553973e141ecafa2bbab62a31a6
@@ -54,19 +54,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");
-	protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
 	proto = xmlnode_get_attrib(bnode, "proto");
-	proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
 
-	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;
============================================================
--- libpurple/group.h	154f157cab8c32e399eee06dd6d57203d9d8c009
+++ libpurple/group.h	1ec0ce1a30734c034f72c541d98bd746a8627217
@@ -57,7 +57,7 @@ xmlnode *group_to_xmlnode(PurpleBlistNod
 };
 
 xmlnode *group_to_xmlnode(PurpleBlistNode *bnode);
-void parse_group(xmlnode *groupnode);
+
 /**
  * Creates a new group
  *