changeset 26690: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 8a77e6cd7eac
children 803e05b3a871 275f43e080fd
files ChangeLog libpurple/protocols/jabber/message.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Apr 26 02:18:03 2009 +0000
+++ b/ChangeLog	Sun Apr 26 02:27:08 2009 +0000
@@ -24,6 +24,8 @@
 	  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
--- a/libpurple/protocols/jabber/message.c	Sun Apr 26 02:18:03 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun Apr 26 02:27:08 2009 +0000
@@ -640,7 +640,8 @@
 							}
 
 							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);