Mercurial > pidgin.yaz
comparison libpurple/buddyicon.c @ 22046:47286f9bb434
merge of '5d18b4aee9c05f592af532f9155aadb23ad11d4b'
and '6d8a02b102307c89d31b4eddc0ceee59673d157b'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 08 Jan 2008 22:01:22 +0000 |
parents | f4c0a7014498 72712558e2be |
children | bc2e96c13556 |
comparison
equal
deleted
inserted
replaced
22036:f4c0a7014498 | 22046:47286f9bb434 |
---|---|
623 } | 623 } |
624 | 624 |
625 purple_buddy_icons_set_caching(caching); | 625 purple_buddy_icons_set_caching(caching); |
626 } | 626 } |
627 | 627 |
628 return (icon ? purple_buddy_icon_ref(icon) : nil); | 628 return (icon ? purple_buddy_icon_ref(icon) : NULL); |
629 } | 629 } |
630 | 630 |
631 gboolean | 631 gboolean |
632 purple_buddy_icons_has_custom_icon(PurpleContact *contact) | 632 purple_buddy_icons_has_custom_icon(PurpleContact *contact) |
633 { | 633 { |