Mercurial > pidgin
comparison libpurple/protocols/jabber/message.c @ 29813:221cebbc35d8
Make it compile again after merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 18 Feb 2010 22:28:41 +0000 |
parents | 1e8dc177415e |
children | 10bf97a36be0 |
comparison
equal
deleted
inserted
replaced
29812:1e8dc177415e | 29813:221cebbc35d8 |
---|---|
996 JabberStream *js = jm->js; | 996 JabberStream *js = jm->js; |
997 | 997 |
998 JabberData *new_data = | 998 JabberData *new_data = |
999 jabber_data_create_from_data(purple_imgstore_get_data(image), | 999 jabber_data_create_from_data(purple_imgstore_get_data(image), |
1000 purple_imgstore_get_size(image), | 1000 purple_imgstore_get_size(image), |
1001 jabber_message_get_mimetype_from_ext(ext), js); | 1001 jabber_message_get_mimetype_from_ext(ext), FALSE, js); |
1002 purple_debug_info("jabber", | 1002 purple_debug_info("jabber", |
1003 "cache local smiley alt = %s, cid = %s\n", | 1003 "cache local smiley alt = %s, cid = %s\n", |
1004 shortcut, jabber_data_get_cid(new_data)); | 1004 shortcut, jabber_data_get_cid(new_data)); |
1005 jabber_data_associate_local(new_data, shortcut); | 1005 jabber_data_associate_local(new_data, shortcut); |
1006 } | 1006 } |