# HG changeset patch # User Etan Reisner # Date 1210830580 0 # Node ID 0ca259d5f928b0fef1a54869387324e355a6df84 # Parent f6c57e6e8a89f20c3eccd6e048da183c29b6ba7a Compile and de-warn. diff -r f6c57e6e8a89 -r 0ca259d5f928 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Thu May 15 04:00:22 2008 +0000 +++ b/pidgin/gtkconv.c Thu May 15 05:49:40 2008 +0000 @@ -2732,7 +2732,7 @@ 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 @@ 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 @@ 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 @@ { 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); diff -r f6c57e6e8a89 -r 0ca259d5f928 pidgin/gtkutils.c --- a/pidgin/gtkutils.c Thu May 15 04:00:22 2008 +0000 +++ b/pidgin/gtkutils.c Thu May 15 05:49:40 2008 +0000 @@ -1461,7 +1461,7 @@ 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;