gobjectification: 834c701c: Fix BList node access in Finch plugins.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 834c701c5312c4e815534675631ecd0d5ddfe2eb
Ancestor: 2db32b737e2f6b6e93a06bd8734b534dd9465f84
Author: qulogic at pidgin.im
Date: 2009-11-08T05:05:31
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/834c701c5312c4e815534675631ecd0d5ddfe2eb

Modified files:
        finch/plugins/gnthistory.c finch/plugins/grouping.c

ChangeLog: 

Fix BList node access in Finch plugins.

-------------- next part --------------
============================================================
--- finch/plugins/gnthistory.c	61a2ce816278e7595e6c3a479c842e60219c47a0
+++ finch/plugins/gnthistory.c	e60959a408dd14217c16f23779a3d57b7b895d36
@@ -74,8 +74,8 @@ static void historize(PurpleConversation
 		for (cur = buddies; cur != NULL; cur = cur->next) {
 			PurpleBlistNode *node = cur->data;
 			if ((node != NULL) &&
-					((purple_blist_node_get_sibling_prev(node) != NULL) ||
-						(purple_blist_node_get_sibling_next(node) != NULL))) {
+					((purple_blist_node_prev(node) != NULL) ||
+						(purple_blist_node_next(node) != NULL))) {
 				PurpleBlistNode *node2;
 
 				alias = purple_buddy_get_contact_alias((PurpleBuddy *)node);
@@ -83,8 +83,8 @@ static void historize(PurpleConversation
 				/* We've found a buddy that matches this conversation.  It's part of a
 				 * PurpleContact with more than one PurpleBuddy.  Loop through the PurpleBuddies
 				 * in the contact and get all the logs. */
-				for (node2 = purple_blist_node_get_first_child(purple_blist_node_get_parent(node));
-						node2 != NULL ; node2 = purple_blist_node_get_sibling_next(node2)) {
+				for (node2 = purple_blist_node_first_child(purple_blist_node_parent(node));
+						node2 != NULL ; node2 = purple_blist_node_next(node2)) {
 					logs = g_list_concat(
 							purple_log_get_logs(PURPLE_LOG_IM,
 								purple_buddy_get_name((PurpleBuddy *)node2),
============================================================
--- finch/plugins/grouping.c	aeb862b4c0c0e2eab7f1867ee657c5d500a07544
+++ finch/plugins/grouping.c	55d3c86ee8bfaa175d03024ae37f104f601fdd4b
@@ -51,7 +51,7 @@ static gboolean on_offline_can_add_node(
 {
 	if(PURPLE_IS_CONTACT(node)){
 		PurpleContact *contact = (PurpleContact*)node;
-		if (contact->currentsize > 0)
+		if (purple_contact_get_currentsize(contact) > 0)
 			return TRUE;
 		return FALSE;
 	} else if(PURPLE_IS_BUDDY(node)){
@@ -78,7 +78,7 @@ static gpointer on_offline_find_parent(P
 		node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
 		ret = PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ? &online : &offline;
 	} else if(PURPLE_IS_BUDDY(node)){
-		ret = purple_blist_node_get_parent(node);
+		ret = purple_blist_node_parent(node);
 		finch_blist_manager_add_node(ret);
 	} else if(PURPLE_IS_CHAT(node)){
 		ret = &online;
@@ -178,7 +178,7 @@ static gpointer no_group_find_parent(Pur
 	gpointer ret = NULL;
 
 	if(PURPLE_IS_BUDDY(node)){
-		finch_blist_manager_add_node(ret = purple_blist_node_get_parent(node));
+		finch_blist_manager_add_node(ret = purple_blist_node_parent(node));
 	}
 	return ret;
 }
@@ -285,7 +285,7 @@ nested_group_can_add_node(PurpleBlistNod
 
 	len = strlen(purple_group_get_name((PurpleGroup*)node));
 	group = purple_blist_get_root();
-	for (; group; group = purple_blist_node_get_sibling_next(group)) {
+	for (; group; group = purple_blist_node_next(group)) {
 		if (group == node)
 			continue;
 		if (strncmp(purple_group_get_name((PurpleGroup *)node),