Mercurial > pidgin.yaz
changeset 30888:2ce4b36f1260
Fall back to a non-icon request dialog if a UI does not support showing icon requests. Fixes receiving file transfer offers including a thumbnail in finch. Closes #12561
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 29 Aug 2010 18:39:49 +0000 |
| parents | 4c050b6e9bd1 |
| children | 99c3b26bb123 |
| files | ChangeLog libpurple/request.c |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 25 19:14:48 2010 +0000 +++ b/ChangeLog Sun Aug 29 18:39:49 2010 +0000 @@ -7,6 +7,9 @@ libpurple: * Added ability to use TURN relaying via TCP and TLS (including preference settings for these). + * 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 Wed Aug 25 19:14:48 2010 +0000 +++ b/libpurple/request.c Sun Aug 29 18:39:49 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;