Mercurial > pidgin
changeset 30456:99c3b26bb123
merge of '1cb5c4ca943e9f7ecd09da32a34b562f4e52269d'
and 'e0d1d5b89727744181eddd937fe7d3ee1dc0603e'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 29 Aug 2010 18:41:26 +0000 |
| parents | 8984210fb574 (current diff) 2ce4b36f1260 (diff) |
| children | 1e684071fbeb |
| files | ChangeLog pidgin/pixmaps/emotes/small/16/cool.png pidgin/pixmaps/emotes/small/16/grin.png |
| diffstat | 2 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Aug 28 07:17:13 2010 +0000 +++ b/ChangeLog Sun Aug 29 18:41:26 2010 +0000 @@ -7,21 +7,9 @@ libpurple: * Added ability to use TURN relaying via TCP and TLS (including preference settings for these). - - Pidgin: - * Add support for the Gadu-Gadu protocol in the gevolution plugin to - provide Evolution integration with contacts with GG IDs. (#10709) - - Finch: - * Add support for drop-down account options (like the SILC cipher - and HMAC options or the QQ protocol version). - - XMPP: - * Fix a crash when multiple accounts are simultaneously performing - SASL authentication when built with Cyrus SASL support. (thanks - to Jan Kaluza) (#11560) - * Restore the ability to connect to XMPP servers that do not offer - Stream ID. (#12331) + * Fall back to an ordinary request if a UI does not support showing a + request with an icon. Fixes receiving MSN file transfer requests including + a thumbnail in Finch. Yahoo/Yahoo JAPAN: * Stop doing unnecessary lookups of certain alias information. This
--- a/libpurple/request.c Sat Aug 28 07:17:13 2010 +0000 +++ b/libpurple/request.c Sun Aug 29 18:41:26 2010 +0000 @@ -1399,6 +1399,11 @@ handles = g_list_append(handles, info); return info->ui_handle; + } else { + /* Fall back on the non-icon request if the UI doesn't support icon + requests */ + return purple_request_action_varg(handle, title, primary, secondary, + default_action, account, who, conv, user_data, action_count, actions); } return NULL;