Mercurial > pidgin
comparison libpurple/ft.c @ 29822:25a53c299713
Allow PRPLs to specify the image formats acceptable for thumbnails (in
preferred order).
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 15 Mar 2010 21:49:02 +0000 |
parents | 10bf97a36be0 |
children | 79bb2804a19e |
comparison
equal
deleted
inserted
replaced
29821:bf0cbb79d629 | 29822:25a53c299713 |
---|---|
177 g_free(xfer->remote_ip); | 177 g_free(xfer->remote_ip); |
178 g_free(xfer->local_filename); | 178 g_free(xfer->local_filename); |
179 | 179 |
180 g_hash_table_remove(xfers_data, xfer); | 180 g_hash_table_remove(xfers_data, xfer); |
181 g_free(xfer->thumbnail_data); | 181 g_free(xfer->thumbnail_data); |
182 g_free(xfer->thumbnail_mimetype); | |
182 | 183 |
183 PURPLE_DBUS_UNREGISTER_POINTER(xfer); | 184 PURPLE_DBUS_UNREGISTER_POINTER(xfer); |
184 xfers = g_list_remove(xfers, xfer); | 185 xfers = g_list_remove(xfers, xfer); |
185 g_free(xfer); | 186 g_free(xfer); |
186 } | 187 } |
1628 purple_xfer_get_thumbnail_size(const PurpleXfer *xfer) | 1629 purple_xfer_get_thumbnail_size(const PurpleXfer *xfer) |
1629 { | 1630 { |
1630 return xfer->thumbnail_size; | 1631 return xfer->thumbnail_size; |
1631 } | 1632 } |
1632 | 1633 |
1634 const gchar * | |
1635 purple_xfer_get_thumbnail_mimetype(const PurpleXfer *xfer) | |
1636 { | |
1637 return xfer->thumbnail_mimetype; | |
1638 } | |
1639 | |
1633 void | 1640 void |
1634 purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail, | 1641 purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail, |
1635 gsize size) | 1642 gsize size, const gchar *mimetype) |
1636 { | 1643 { |
1637 if (thumbnail && size > 0) { | 1644 if (thumbnail && size > 0) { |
1638 xfer->thumbnail_data = g_memdup(thumbnail, size); | 1645 xfer->thumbnail_data = g_memdup(thumbnail, size); |
1639 xfer->thumbnail_size = size; | 1646 xfer->thumbnail_size = size; |
1647 xfer->thumbnail_mimetype = g_strdup(mimetype); | |
1640 } | 1648 } |
1641 } | 1649 } |
1642 | 1650 |
1643 void | 1651 void |
1644 purple_xfer_prepare_thumbnail(PurpleXfer *xfer) | 1652 purple_xfer_prepare_thumbnail(PurpleXfer *xfer) |