Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/message.c @ 27906:6ecfc6b9667c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head ca4b6e987b967927b0f8bd001bc33440a6885000) to branch 'im.pidgin.pidgin.yaz' (head 7a92169e2ac82026d2b2918ed9662c7fd42e3280)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 17 Nov 2008 06:15:33 +0000
parents 43b19e3dbda7 fae699fece1f
children 0a6f702bf9dc
comparison
equal deleted inserted replaced
27905:45ce87f9a07f 27906:6ecfc6b9667c
614 JabberID *jid = jabber_id_new(jm->from); 614 JabberID *jid = jabber_id_new(jm->from);
615 JabberChat *chat = NULL; 615 JabberChat *chat = NULL;
616 616
617 if (jid) { 617 if (jid) {
618 chat = jabber_chat_find(js, jid->node, jid->domain); 618 chat = jabber_chat_find(js, jid->node, jid->domain);
619 conv = chat->conv; 619 if (chat) conv = chat->conv;
620 } 620 }
621 621
622 jabber_id_free(jid); 622 jabber_id_free(jid);
623 } else { 623 } else {
624 conv = 624 conv =
648 648
649 /* add known custom emoticons to the conversation */ 649 /* add known custom emoticons to the conversation */
650 /* note: if there were no smileys in the incoming message, or 650 /* note: if there were no smileys in the incoming message, or
651 if receiving custom smileys is turned off, smiley_refs will 651 if receiving custom smileys is turned off, smiley_refs will
652 be NULL */ 652 be NULL */
653 for (; smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) { 653 for (; conv && smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) {
654 JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data; 654 JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data;
655 const gchar *cid = ref->cid; 655 const gchar *cid = ref->cid;
656 const gchar *alt = ref->alt; 656 const gchar *alt = ref->alt;
657 657
658 purple_debug_info("jabber", 658 purple_debug_info("jabber",