comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- next.minor
- changeset 23284
- 8584cb2422e5
- parent 23036
- 5b415c84861f
- child 23287
- 4b4f5e80e324
equal
deleted
inserted
replaced
| 23283:93261f547412 | 23284:8584cb2422e5 |
|---|---|
| 2873 buddy = purple_find_buddy(purple_conversation_get_account(conv), | 2873 buddy = purple_find_buddy(purple_conversation_get_account(conv), |
| 2874 purple_conversation_get_name(conv)); | 2874 purple_conversation_get_name(conv)); |
| 2875 if (buddy) | 2875 if (buddy) |
| 2876 { | 2876 { |
| 2877 PurpleContact *contact = purple_buddy_get_contact(buddy); | 2877 PurpleContact *contact = purple_buddy_get_contact(buddy); |
| 2878 if (contact && purple_buddy_icons_has_custom_icon(contact)) | 2878 if (contact && purple_buddy_icons_node_has_custom_icon(contact)) |
| 2879 { | 2879 { |
| 2880 pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL, | 2880 pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL, |
| 2881 G_CALLBACK(remove_custom_icon_cb), gtkconv, | 2881 G_CALLBACK(remove_custom_icon_cb), gtkconv, |
| 2882 0, 0, NULL); | 2882 0, 0, NULL); |
| 2883 } | 2883 } |
| 6910 buddy = purple_find_buddy(account, purple_conversation_get_name(conv)); | 6910 buddy = purple_find_buddy(account, purple_conversation_get_name(conv)); |
| 6911 if (buddy) | 6911 if (buddy) |
| 6912 { | 6912 { |
| 6913 PurpleContact *contact = purple_buddy_get_contact(buddy); | 6913 PurpleContact *contact = purple_buddy_get_contact(buddy); |
| 6914 if (contact) { | 6914 if (contact) { |
| 6915 custom_img = purple_buddy_icons_find_custom_icon(contact); | 6915 custom_img = purple_buddy_icons_node_find_custom_icon(contact); |
| 6916 if (custom_img) { | 6916 if (custom_img) { |
| 6917 /* There is a custom icon for this user */ | 6917 /* There is a custom icon for this user */ |
| 6918 data = purple_imgstore_get_data(custom_img); | 6918 data = purple_imgstore_get_data(custom_img); |
| 6919 len = purple_imgstore_get_size(custom_img); | 6919 len = purple_imgstore_get_size(custom_img); |
| 6920 } | 6920 } |
