Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/message.c @ 24704:bdd00a7113d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
24703:2f01775c81d5 24704:bdd00a7113d7
610 JabberID *jid = jabber_id_new(jm->from); 610 JabberID *jid = jabber_id_new(jm->from);
611 JabberChat *chat = NULL; 611 JabberChat *chat = NULL;
612 612
613 if (jid) { 613 if (jid) {
614 chat = jabber_chat_find(js, jid->node, jid->domain); 614 chat = jabber_chat_find(js, jid->node, jid->domain);
615 conv = chat->conv; 615 if (chat) conv = chat->conv;
616 } 616 }
617 617
618 jabber_id_free(jid); 618 jabber_id_free(jid);
619 } else { 619 } else {
620 conv = 620 conv =
642 642
643 /* add known custom emoticons to the conversation */ 643 /* add known custom emoticons to the conversation */
644 /* note: if there were no smileys in the incoming message, or 644 /* note: if there were no smileys in the incoming message, or
645 if receiving custom smileys is turned off, smiley_refs will 645 if receiving custom smileys is turned off, smiley_refs will
646 be NULL */ 646 be NULL */
647 for (; smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) { 647 for (; conv && smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) {
648 JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data; 648 JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data;
649 const gchar *cid = ref->cid; 649 const gchar *cid = ref->cid;
650 const gchar *alt = ref->alt; 650 const gchar *alt = ref->alt;
651 651
652 purple_debug_info("jabber", 652 purple_debug_info("jabber",