gobjectification: 545dbae5: Fix Pidgin compile.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 545dbae50274bb462c9f74e5058389f2d2c23ea2
Parent:   59330ed07b381531d967c2e841c251d86114aef7
Author:   qulogic at pidgin.im
Date:     03/20/11 20:26:12
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/545dbae50274bb462c9f74e5058389f2d2c23ea2

Changelog: 

Fix Pidgin compile.

Changes against parent 59330ed07b381531d967c2e841c251d86114aef7

  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	630f0e8f6f19b92d0546815ec72c8c655af56a15
+++ pidgin/gtkconv.c	ed39e9735ff1f81d15b6013c286104e9c9292652
@@ -4532,7 +4532,7 @@ buddy_added_cb(PurpleBlistNode *node, Pu
 static void
 buddy_added_cb(PurpleBlistNode *node, PurpleConversation *conv)
 {
-	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
+	if (!PURPLE_IS_BUDDY(node))
 		return;
 
 	buddy_cb_common(PURPLE_BUDDY(node), conv, TRUE);
@@ -6763,7 +6763,7 @@ pidgin_conv_update_fields(PurpleConversa
 			title = g_strdup(purple_conversation_get_title(conv));
 
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
-			buddy = purple_find_buddy(account, conv->name);
+			buddy = purple_conversation_find_buddy(conv);
 			if (buddy) {
 				markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
 			} else {
============================================================
--- pidgin/gtkblist.c	2cc5e2556f19e068845e4358a8fe8b61065adae3
+++ pidgin/gtkblist.c	e3c8664c5fcba83c3213d0398785b2851977771f
@@ -7713,7 +7713,7 @@ static void sort_method_status(PurpleBli
 		gtk_tree_store_append(gtkblist->treemodel, iter, &groupiter);
 		return;
 	} else {
-		sort_method_alphabetical(node, blist, groupiter, cur, iter);
+		sort_method_alphabetical(node, groupiter, cur, iter);
 		return;
 	}