# HG changeset patch # User Marcus Lundblad # Date 1266532121 0 # Node ID 221cebbc35d86c5b7b5c5f47a4f3464b82c32835 # Parent 1e8dc177415e5e912adb69a186c18823aed80eb8 Make it compile again after merge diff -r 1e8dc177415e -r 221cebbc35d8 libpurple/protocols/jabber/message.c --- 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));