pidgin: 7399f80e: Removed som extranious debug output
malu at pidgin.im
malu at pidgin.im
Mon Nov 24 16:31:00 EST 2008
-----------------------------------------------------------------
Revision: 7399f80ea98924dbddd57be1e652ecbae89d3a8e
Ancestor: df86c6f1de324e87828356aa8d5c369abd533b58
Author: malu at pidgin.im
Date: 2008-11-24T21:28:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7399f80ea98924dbddd57be1e652ecbae89d3a8e
Modified files:
libpurple/protocols/jabber/message.c
ChangeLog:
Removed som extranious debug output
Don't call jabber_buddy_find unless the conversation is an IM
Thanks to Darkrain42 for hints
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c 30fd387ec6b98d85de83688fe30247481a9911c0
+++ libpurple/protocols/jabber/message.c 742bba782e196e2fe87649f51de1f14006592a97
@@ -913,19 +913,15 @@ jabber_conv_support_custom_smileys(const
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;
More information about the Commits
mailing list