Mercurial > pidgin
comparison libpurple/buddyicon.c @ 16971:21b7f05a2878
merge of '4a0f05c690f6ef4c2ebc7f27bc1b7c161b497b8d'
and '4ae685b280f8d6e5d3f46bc983e817c037d00142'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 09 May 2007 19:12:26 +0000 |
| parents | a520e48dbfef |
| children | c588a4a9d287 |
comparison
equal
deleted
inserted
replaced
| 16960:5143cdd8ad79 | 16971:21b7f05a2878 |
|---|---|
| 414 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, | 414 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, |
| 415 "icon_checksum"); | 415 "icon_checksum"); |
| 416 } | 416 } |
| 417 ref_filename(filename); | 417 ref_filename(filename); |
| 418 } | 418 } |
| 419 else | 419 else if (!icon->img) |
| 420 { | 420 { |
| 421 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon"); | 421 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon"); |
| 422 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum"); | 422 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum"); |
| 423 } | 423 } |
| 424 unref_filename(old_icon); | 424 unref_filename(old_icon); |