pidgin: e0d1d5b8: Fall back to a non-icon request dialog i...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: e0d1d5b89727744181eddd937fe7d3ee1dc0603e
Parent:   dcc92bf5bf2f627deda9931546a5f10f2e02247d
Author:   malu at pidgin.im
Date:     08/29/10 14:39:49
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e0d1d5b89727744181eddd937fe7d3ee1dc0603e

Changelog: 

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

Changes against parent dcc92bf5bf2f627deda9931546a5f10f2e02247d

  patched  ChangeLog
  patched  libpurple/request.c

-------------- next part --------------
============================================================
--- ChangeLog	b234b5ce8eeff10eb3202a52530bec4470f5f46e
+++ ChangeLog	f5ad442823d47e4626cbac75e0e128763f38ca5f
@@ -7,6 +7,9 @@ version 2.7.4 (MM/DD/YYYY):
 	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
============================================================
--- libpurple/request.c	a28b00b3cfe02ceea164805441b4453cc4743769
+++ libpurple/request.c	32d104a6995ee2720888325b60f12768708cf69c
@@ -1399,6 +1399,11 @@ purple_request_action_with_icon_varg(voi
 		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;