Mercurial > pidgin

comparison libpurple/protocols/jabber/message.c @ 29803:5502f855ec2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 0d33eae1cfd57cb5f459518ad5db14230f13792b) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 787088ed111a5a80051cdedac170a0eae9bdadcc)
author Marcus Lundblad <ml@update.uu.se>
date Tue, 20 Oct 2009 22:32:09 +0000
parents 41992511531f 0687561104d2
children d0730ad1c7df
comparison
equal deleted inserted replaced
28408:d1c18bd588e2 29803:5502f855ec2b
1000 JabberStream *js = jm->js; 1000 JabberStream *js = jm->js;
1001 1001
1002 JabberData *new_data = 1002 JabberData *new_data =
1003 jabber_data_create_from_data(purple_imgstore_get_data(image), 1003 jabber_data_create_from_data(purple_imgstore_get_data(image),
1004 purple_imgstore_get_size(image), 1004 purple_imgstore_get_size(image),
1005 jabber_message_get_mimetype_from_ext(ext), js); 1005 jabber_message_get_mimetype_from_ext(ext), FALSE, js);
1006 purple_debug_info("jabber", 1006 purple_debug_info("jabber",
1007 "cache local smiley alt = %s, cid = %s\n", 1007 "cache local smiley alt = %s, cid = %s\n",
1008 shortcut, jabber_data_get_cid(new_data)); 1008 shortcut, jabber_data_get_cid(new_data));
1009 jabber_data_associate_local(new_data, shortcut); 1009 jabber_data_associate_local(new_data, shortcut);
1010 } 1010 }