Mercurial > pidgin

changeset 24527:1b61f62e5240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed som extranious debug output Don't call jabber_buddy_find unless the conversation is an IM Thanks to Darkrain42 for hints
author Marcus Lundblad <ml@update.uu.se>
date Mon, 24 Nov 2008 21:28:22 +0000
parents f3103f786c86
children b2e4d88383a2 6986ae0cbb51 d0af449f13dc 487a750cc924 558baf33197e
files libpurple/protocols/jabber/message.c
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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;