Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 30295:77aba27f64da
merged from im.pidgin.pidgin.
removed our modification to jabber file transfer for now.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 05 May 2010 15:42:34 +0900 |
| parents | f988f25259c7 38926d6e5ae1 |
| children | 46275cca345e |
comparison
equal
deleted
inserted
replaced
| 30196:28dd2b7331fd | 30295:77aba27f64da |
|---|---|
| 967 JabberStream *js = jm->js; | 967 JabberStream *js = jm->js; |
| 968 | 968 |
| 969 JabberData *new_data = | 969 JabberData *new_data = |
| 970 jabber_data_create_from_data(purple_imgstore_get_data(image), | 970 jabber_data_create_from_data(purple_imgstore_get_data(image), |
| 971 purple_imgstore_get_size(image), | 971 purple_imgstore_get_size(image), |
| 972 jabber_message_get_mimetype_from_ext(ext), js); | 972 jabber_message_get_mimetype_from_ext(ext), FALSE, js); |
| 973 purple_debug_info("jabber", | 973 purple_debug_info("jabber", |
| 974 "cache local smiley alt = %s, cid = %s\n", | 974 "cache local smiley alt = %s, cid = %s\n", |
| 975 shortcut, jabber_data_get_cid(new_data)); | 975 shortcut, jabber_data_get_cid(new_data)); |
| 976 jabber_data_associate_local(new_data, shortcut); | 976 jabber_data_associate_local(new_data, shortcut); |
| 977 } | 977 } |