# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1240003758 0
# Node ID c0ab14a1e43a6e9289e029f2b6b36a10736d2659
# Parent  8c3b1a059ecc6c2e67e2db2db9567eb1c7b557aa# Parent  cb6dd7ee9df32006e0c212a16796c9162a10c566
merge of '580055bb22fea0076d3a90d9df9346abd1789bab'
     and 'fade006b4836b4f79bfcbf8d5be330408eda6273'

diff -r 8c3b1a059ecc -r c0ab14a1e43a libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Sun Apr 12 23:57:27 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Fri Apr 17 21:29:18 2009 +0000
@@ -626,24 +626,27 @@
 					purple_debug_info("jabber", "found %d smileys\n",
 						g_list_length(smiley_refs));
 
-					if (jm->type == JABBER_MESSAGE_GROUPCHAT) {
-						JabberID *jid = jabber_id_new(jm->from);
-						JabberChat *chat = NULL;
+					if (smiley_refs) {		
+						if (jm->type == JABBER_MESSAGE_GROUPCHAT) {
+							JabberID *jid = jabber_id_new(jm->from);
+							JabberChat *chat = NULL;
 
-						if (jid) {
-							chat = jabber_chat_find(js, jid->node, jid->domain);
-							if (chat) conv = chat->conv;
-						}
+							if (jid) {
+								chat = jabber_chat_find(js, jid->node, jid->domain);
+								if (chat) conv = chat->conv;
+							}
 
-						jabber_id_free(jid);
-					} else {
-						conv =
-							purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
-								who, account);
-						if (!conv) {
-							/* we need to create the conversation here */
-							conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-								account, who);
+							jabber_id_free(jid);
+						} else {
+							conv =
+								purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
+									who, account);
+							if (!conv) {
+								/* we need to create the conversation here */
+								conv = 
+									purple_conversation_new(PURPLE_CONV_TYPE_IM,
+									account, who);
+							}
 						}
 					}
 
@@ -675,7 +678,7 @@
 						    TRUE)) {
 						const JabberData *data =
 								jabber_data_find_remote_by_cid(cid);
-						/* if data is already known, we add write it immediatly */
+						/* if data is already known, we write it immediatly */
 						if (data) {
 							purple_debug_info("jabber",
 								"data is already known\n");