Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 30215:0687561104d2
propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 92cade199b5a7b1bcb88a6264f672811ed7f9fc6)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 20 Sep 2009 19:57:07 +0000 |
| parents | e8717ca47d25 508bd30ee8ba |
| children | 5502f855ec2b |
comparison
equal
deleted
inserted
replaced
| 28646:5f97830906bc | 30215:0687561104d2 |
|---|---|
| 985 JabberStream *js = jm->js; | 985 JabberStream *js = jm->js; |
| 986 | 986 |
| 987 JabberData *new_data = | 987 JabberData *new_data = |
| 988 jabber_data_create_from_data(purple_imgstore_get_data(image), | 988 jabber_data_create_from_data(purple_imgstore_get_data(image), |
| 989 purple_imgstore_get_size(image), | 989 purple_imgstore_get_size(image), |
| 990 jabber_message_get_mimetype_from_ext(ext), js); | 990 jabber_message_get_mimetype_from_ext(ext), FALSE, js); |
| 991 purple_debug_info("jabber", | 991 purple_debug_info("jabber", |
| 992 "cache local smiley alt = %s, cid = %s\n", | 992 "cache local smiley alt = %s, cid = %s\n", |
| 993 shortcut, jabber_data_get_cid(new_data)); | 993 shortcut, jabber_data_get_cid(new_data)); |
| 994 jabber_data_associate_local(new_data, shortcut); | 994 jabber_data_associate_local(new_data, shortcut); |
| 995 } | 995 } |