comparison: libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/message.c
- branch
- cpw.attention_ui
- changeset 25935
- ada7791caa29
- parent 25933
- 02b7c0dbf105
- parent 24789
- ee944c10dab6
- child 25937
- 0e25d1df776d
equal
deleted
inserted
replaced
| 25934:7f05d5b0c921 | 25935:ada7791caa29 |
|---|---|
| 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 } |
