# HG changeset patch # User Evan Schoenberg # Date 1199665946 0 # Node ID 6f452e8d13a2038ad609ad2a5b313861ea2bc41e # Parent d65fd48a3ad9bafa021c269e1d5ae2d3fe6bf02c If the cached buddy icon can't be loaded, delete the preferences which point to it. Among other things, this fixes OSCAR buddy icon retrieval when the cache has been removed - since previously the icon hash was kept around and was used to determine that (so far as the prpl could tell) no icon retrieval was needed, libpurple would never have an icon for the contact. diff -r d65fd48a3ad9 -r 6f452e8d13a2 libpurple/buddyicon.c --- a/libpurple/buddyicon.c Sun Jan 06 20:59:02 2008 +0000 +++ b/libpurple/buddyicon.c Mon Jan 07 00:32:26 2008 +0000 @@ -614,6 +614,10 @@ checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum"); purple_buddy_icon_set_data(icon, data, len, checksum); } + else + { + delete_buddy_icon_settings((PurpleBlistNode*)b, "buddy_icon"); + } g_free(path); }