Mercurial > pidgin.yaz
changeset 20419:c2b406b4ccd7
Port a custom emoticon crash fix that seemed to get lost somewhere along
the way in the msnp14 branch - probably back in the SVN days
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 20 May 2007 15:59:10 +0000 |
| parents | 0f6747c5dcc2 |
| children | 8aa5e490dbf7 |
| files | libpurple/protocols/msn/slp.c |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Sun May 20 15:48:51 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Sun May 20 15:59:10 2007 +0000 @@ -776,14 +776,15 @@ gc = slpcall->slplink->session->account->gc; who = slpcall->slplink->remote_user; - conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account); + if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account))) { - /* FIXME: it would be better if we wrote the data as we received it - instead of all at once, calling write multiple times and - close once at the very end - */ - purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); - purple_conv_custom_smiley_close(conv, slpcall->data_info ); + /* FIXME: it would be better if we wrote the data as we received it + instead of all at once, calling write multiple times and + close once at the very end + */ + purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); + purple_conv_custom_smiley_close(conv, slpcall->data_info ); + } #ifdef MSN_DEBUG_UD purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info); #endif