comparison: libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/message.c
- changeset 35792
- d18a48a68edf
- parent 35788
- afa6d777bc7c
- child 35823
- 268a9d3b3fd7
equal
deleted
inserted
replaced
| 35791:a304796f1c09 | 35792:d18a48a68edf |
|---|---|
| 918 conv = purple_conversations_find_with_account(jm->to, account); | 918 conv = purple_conversations_find_with_account(jm->to, account); |
| 919 | 919 |
| 920 if (!jabber_conv_support_custom_smileys(jm->js, conv, jm->to)) | 920 if (!jabber_conv_support_custom_smileys(jm->js, conv, jm->to)) |
| 921 return NULL; | 921 return NULL; |
| 922 | 922 |
| 923 found_smileys = purple_smiley_find(purple_smiley_custom_get_list(), | 923 found_smileys = purple_smiley_parser_find( |
| 924 xhtml, TRUE); | 924 purple_smiley_custom_get_list(), xhtml, TRUE); |
| 925 if (!found_smileys) | 925 if (!found_smileys) |
| 926 return NULL; | 926 return NULL; |
| 927 | 927 |
| 928 for (it = found_smileys; it; it = it_next) { | 928 for (it = found_smileys; it; it = it_next) { |
| 929 PurpleSmiley *smiley = it->data; | 929 PurpleSmiley *smiley = it->data; |
| 988 jabber_data_associate_local(jdata, shortcut); | 988 jabber_data_associate_local(jdata, shortcut); |
| 989 } | 989 } |
| 990 | 990 |
| 991 g_list_free(found_smileys); | 991 g_list_free(found_smileys); |
| 992 | 992 |
| 993 smileyfied_xhtml = purple_smiley_parse_custom(xhtml, | 993 smileyfied_xhtml = purple_smiley_parser_replace( |
| 994 purple_smiley_custom_get_list(), xhtml, | |
| 994 jabber_message_smileyify_cb, NULL); | 995 jabber_message_smileyify_cb, NULL); |
| 995 | 996 |
| 996 return smileyfied_xhtml; | 997 return smileyfied_xhtml; |
| 997 } | 998 } |
| 998 | 999 |
