pidgin: 120a0724: Only look for and add custom smileys to ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 120a0724eaee9fda26198bc2f9f1e8c63ac6557b
Ancestor: 279952a5189f9f57a85d73e53794bc1fbcf86ae9
Author: darkrain42 at pidgin.im
Date: 2009-04-26T02:27:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/120a0724eaee9fda26198bc2f9f1e8c63ac6557b

Modified files:
        ChangeLog libpurple/protocols/jabber/message.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- ChangeLog	c1e2cd8637973b4e2f640db0e302604d1a0cc583
+++ ChangeLog	13bb4559bc289d35a8385606b3ec0cc85e6f2ee3
@@ -24,6 +24,8 @@ version 2.6.0 (??/??/2009):
 	  client supports it.
 	* The set_chat_topic function can unset the chat topic.
 	* Fix crash on connection with recent gstreamer0.10-plugins-bad.
+	* Don't create a new conversation window for incoming messages of
+	  type 'headline'.
 
 	IRC:
 	* Correctly handle WHOIS for users who are joined to a large number of
============================================================
--- libpurple/protocols/jabber/message.c	ae7d630f1cd9cc0d6f35b07f318d4a3946498001
+++ libpurple/protocols/jabber/message.c	cbd33175ecd35c6b1fa712d1723f052825478df2
@@ -640,7 +640,8 @@ void jabber_message_parse(JabberStream *
 							}
 
 							jabber_id_free(jid);
-						} else {
+						} else if (jm->type == JABBER_MESSAGE_NORMAL ||
+						           jm->type == JABBER_MESSAGE_CHAT) {
 							conv =
 								purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
 									who, account);