Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/message.c @ 30245:38926d6e5ae1
propagate from branch 'im.pidgin.pidgin' (head 83880c1513774ae8550442dfe002355056d39021)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head ce7131f6a58510cde83d0cb3945eca0795e1e2aa)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 24 Mar 2010 19:56:07 +0000 |
| parents | 1bde873d1b94 f14cbb6a28a7 |
| children | 77aba27f64da 097569720d68 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Wed Mar 24 02:38:56 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Wed Mar 24 19:56:07 2010 +0000 @@ -963,7 +963,7 @@ JabberData *new_data = jabber_data_create_from_data(purple_imgstore_get_data(image), purple_imgstore_get_size(image), - jabber_message_get_mimetype_from_ext(ext), js); + jabber_message_get_mimetype_from_ext(ext), FALSE, js); purple_debug_info("jabber", "cache local smiley alt = %s, cid = %s\n", shortcut, jabber_data_get_cid(new_data));