Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 26772:0054bf136314
Only look for and add custom smileys to incoming messages that are going to
end up being displayed in a conversation window (i.e. not headline messages).
Closes #7516.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 26 Apr 2009 02:27:08 +0000 |
| parents | 06da00c70eae |
| children | 83e6e710cbf3 |
comparison
equal
deleted
inserted
replaced
| 26771:8a77e6cd7eac | 26772:0054bf136314 |
|---|---|
| 638 chat = jabber_chat_find(js, jid->node, jid->domain); | 638 chat = jabber_chat_find(js, jid->node, jid->domain); |
| 639 if (chat) conv = chat->conv; | 639 if (chat) conv = chat->conv; |
| 640 } | 640 } |
| 641 | 641 |
| 642 jabber_id_free(jid); | 642 jabber_id_free(jid); |
| 643 } else { | 643 } else if (jm->type == JABBER_MESSAGE_NORMAL || |
| 644 jm->type == JABBER_MESSAGE_CHAT) { | |
| 644 conv = | 645 conv = |
| 645 purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, | 646 purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, |
| 646 who, account); | 647 who, account); |
| 647 if (!conv) { | 648 if (!conv) { |
| 648 /* we need to create the conversation here */ | 649 /* we need to create the conversation here */ |