diff libpurple/protocols/jabber/message.c @ 29262:558baf33197e

propagate from branch 'im.pidgin.pidgin' (head 7399f80ea98924dbddd57be1e652ecbae89d3a8e) to branch 'im.pidgin.cpw.attention_ui' (head 59a01fefc852925a87d40736c747f639270c11be)

--- a/libpurple/protocols/jabber/message.c	Tue Nov 18 22:35:08 2008 +0000
+++ b/libpurple/protocols/jabber/message.c	Mon Nov 24 22:13:44 2008 +0000
@@ -914,19 +914,15 @@
 		return FALSE;
 	}
 
-	jb = jabber_buddy_find(js, who, FALSE);
-	if (!jb) {
-		purple_debug_error("jabber",
-			"jabber_conv_support_custom smileys: could not find buddy\n");
-		return FALSE;
-	}
-	
-	
-
 	switch (purple_conversation_get_type(conv)) {
 		/* for the time being, we will not support custom smileys in MUCs */
 		case PURPLE_CONV_TYPE_IM:
-			return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE);
+			jb = jabber_buddy_find(js, who, FALSE);
+			if (jb) {
+				return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE);
+			} else {
+				return NULL;
+			}
 			break;
 		default:
 			return FALSE;