Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/message.c @ 24704:bdd00a7113d7
propagate from branch 'im.pidgin.pidgin' (head f3891f3348abfe90fbe60a054833c12075aa8df4)
to branch 'im.pidgin.cpw.malu.xmpp.attention' (head d235bb23dbe13535f85e071d6c4f42e07ac6e0ce)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 16 Nov 2008 15:39:46 +0000 |
| parents | f763be370afb fae699fece1f |
| children | d0af449f13dc |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Thu Nov 13 19:51:47 2008 +0000 +++ b/libpurple/protocols/jabber/message.c Sun Nov 16 15:39:46 2008 +0000 @@ -612,7 +612,7 @@ if (jid) { chat = jabber_chat_find(js, jid->node, jid->domain); - conv = chat->conv; + if (chat) conv = chat->conv; } jabber_id_free(jid); @@ -644,7 +644,7 @@ /* note: if there were no smileys in the incoming message, or if receiving custom smileys is turned off, smiley_refs will be NULL */ - for (; smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) { + for (; conv && smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) { JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data; const gchar *cid = ref->cid; const gchar *alt = ref->alt;