Mercurial > pidgin
changeset 17547:13f7a06c240d
merge of '4b50880d8517570eaa67d4cd9d88c5934bb832f1'
and 'c01626696f1218b430181303c6e69eeba2469947'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 08 Jun 2007 12:38:30 +0000 |
| parents | 5eebb9b24e30 (current diff) 4b4eb353cf9f (diff) |
| children | ef3f817cac91 |
| files | libpurple/protocols/jabber/jabber.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Thu Jun 07 14:47:30 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Jun 08 12:38:30 2007 +0000 @@ -1074,8 +1074,10 @@ /* lets make sure our buddy icon is up to date * before we go letting people know we're here */ img = purple_buddy_icons_find_account_icon(js->gc->account); - jabber_set_buddy_icon(js->gc, img); - purple_imgstore_unref(img); + if(NULL != img) { + jabber_set_buddy_icon(js->gc, img); + purple_imgstore_unref(img); + } /* now we can alert the core that we're ready to send status */ purple_connection_set_state(js->gc, PURPLE_CONNECTED);