# HG changeset patch # User Marcus Lundblad # Date 1283107189 0 # Node ID 2ce4b36f1260077179bf6cbc52d6c0738dd547f7 # Parent 4c050b6e9bd14d8259eabba5b756521abd8d1595 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 diff -r 4c050b6e9bd1 -r 2ce4b36f1260 ChangeLog --- 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 diff -r 4c050b6e9bd1 -r 2ce4b36f1260 libpurple/request.c --- 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;