pidgin.next.minor: df0ddcef: Compile and de-warn.

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: df0ddcef268608879c9e3ecd095cb74903d279e8
Ancestor: 795e93eda97c392c680630d8f8e52f6a9eb50937
Author: deryni at pidgin.im
Date: 2008-05-15T05:49:40
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/df0ddcef268608879c9e3ecd095cb74903d279e8

Modified files:
        pidgin/gtkconv.c pidgin/gtkutils.c

ChangeLog: 

Compile and de-warn.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	a4c7e6c3f68446f14f80e94bd2f1a49a490708bb
+++ pidgin/gtkconv.c	61fe2a1069f614edee9f93b1e92ab7296cf1e68a
@@ -2732,7 +2732,7 @@ custom_icon_sel_cb(const char *filename,
 		PurpleAccount *account = purple_conversation_get_account(conv);
 
 		name = purple_conversation_get_name(conv);
-		buddy = purple_buddy_find(account, name);
+		buddy = purple_find_buddy(account, name);
 		if (!buddy) {
 			purple_debug_info("custom-icon", "You can only set custom icons for people on your buddylist.\n");
 			return;
@@ -2788,12 +2788,12 @@ remove_custom_icon_cb(GtkWidget *widget,
 	PurpleConversation *conv = gtkconv->active_conv;
 
 	account = purple_conversation_get_account(conv);
-	buddy = purple_buddy_find(account, name);
+	name = purple_conversation_get_name(conv);
+	buddy = purple_find_buddy(account, name);
 	if (!buddy) {
 		return;
 	}
 	contact = purple_buddy_get_contact(buddy);
-	name = purple_conversation_get_name(conv);
 
 	purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, NULL);
 }
@@ -2896,7 +2896,7 @@ icon_menu(GtkObject *obj, GdkEventButton
 	if (buddy)
 	{
 		PurpleContact *contact = purple_buddy_get_contact(buddy);
-		if (contact && purple_buddy_icons_node_has_custom_icon(contact))
+		if (contact && purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact))
 		{
 			pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
 			                           G_CALLBACK(remove_custom_icon_cb), gtkconv,
@@ -6933,7 +6933,7 @@ pidgin_conv_update_buddy_icon(PurpleConv
 	{
 		PurpleContact *contact = purple_buddy_get_contact(buddy);
 		if (contact) {
-			custom_img = purple_buddy_icons_node_find_custom_icon(contact);
+			custom_img = purple_buddy_icons_node_find_custom_icon((PurpleBlistNode*)contact);
 			if (custom_img) {
 				/* There is a custom icon for this user */
 				data = purple_imgstore_get_data(custom_img);
============================================================
--- pidgin/gtkutils.c	30fe895e7ba24d90022f842e6980859a5b765ac7
+++ pidgin/gtkutils.c	1b3a9bfa8b4b70851a5fd51e0c2ab874f0051e50
@@ -1461,7 +1461,7 @@ static void dnd_image_ok_callback(_DndDa
 			return;
 		}
 
-		buddy = purple_buddy_find(account, data->who);
+		buddy = purple_find_buddy(data->account, data->who);
 		if (!buddy) {
 			purple_debug_info("custom-icon", "You can only set custom icons for people on your buddylist.\n");
 			break;