Mercurial > pidgin
changeset 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 | 6d3a90b49dba |
| files | libpurple/protocols/jabber/message.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Thu Feb 18 21:59:26 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Thu Feb 18 22:28:41 2010 +0000 @@ -998,7 +998,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));