cpw.malu.ft_thumbnails: 14eca8a3: Make it compile again after merge

malu at pidgin.im malu at pidgin.im
Thu Feb 18 17:30:33 EST 2010


-----------------------------------------------------------------
Revision: 14eca8a36cf4d5e66226c1d94d6d44b5219b1476
Ancestor: 449ca1863ceb50f9f59059ff2c42668aa5e1da9f
Author: malu at pidgin.im
Date: 2010-02-18T22:28:41
Branch: im.pidgin.cpw.malu.ft_thumbnails
URL: http://d.pidgin.im/viewmtn/revision/info/14eca8a36cf4d5e66226c1d94d6d44b5219b1476

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

Make it compile again after merge

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c	c0f8d79bcffce0d66dcab8f8c65d88bc418bdaf3
+++ libpurple/protocols/jabber/message.c	6750442129cdd11be5adedc66b6edb515f8f26e6
@@ -998,7 +998,7 @@ jabber_message_smileyfy_xhtml(JabberMess
 						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));


More information about the Commits mailing list