Mercurial > pidgin

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 7399f80ea98924dbddd57be1e652ecbae89d3a8e) to branch 'im.pidgin.cpw.attention_ui' (head 59a01fefc852925a87d40736c747f639270c11be)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 24 Nov 2008 22:13:44 +0000
parents eab9700e6361 1b61f62e5240
children a0fd6a41d127
comparison
equal deleted inserted replaced
29261:24aa608c5388 29262:558baf33197e
912 purple_debug_error("jabber", 912 purple_debug_error("jabber",
913 "jabber_conv_support_custom_smileys: could not find stream\n"); 913 "jabber_conv_support_custom_smileys: could not find stream\n");
914 return FALSE; 914 return FALSE;
915 } 915 }
916 916
917 jb = jabber_buddy_find(js, who, FALSE);
918 if (!jb) {
919 purple_debug_error("jabber",
920 "jabber_conv_support_custom smileys: could not find buddy\n");
921 return FALSE;
922 }
923
924
925
926 switch (purple_conversation_get_type(conv)) { 917 switch (purple_conversation_get_type(conv)) {
927 /* for the time being, we will not support custom smileys in MUCs */ 918 /* for the time being, we will not support custom smileys in MUCs */
928 case PURPLE_CONV_TYPE_IM: 919 case PURPLE_CONV_TYPE_IM:
929 return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE); 920 jb = jabber_buddy_find(js, who, FALSE);
921 if (jb) {
922 return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE);
923 } else {
924 return NULL;
925 }
930 break; 926 break;
931 default: 927 default:
932 return FALSE; 928 return FALSE;
933 break; 929 break;
934 } 930 }