# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1227562102 0
# Node ID 1b61f62e5240d767dcd97a36e09105708a16b656
# Parent  f3103f786c865e3ce0d8135c0656c504b5c52409
Removed som extranious debug output
Don't call jabber_buddy_find unless the conversation is an IM
Thanks to Darkrain42 for hints

diff -r f3103f786c86 -r 1b61f62e5240 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Mon Nov 24 03:23:25 2008 +0000
+++ b/libpurple/protocols/jabber/message.c	Mon Nov 24 21:28:22 2008 +0000
@@ -913,19 +913,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;