# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1283107286 0
# Node ID 99c3b26bb1234e980c4ee791952f11ea2ee5dadd
# Parent  8984210fb574f58ce6f4ca019a7c0682ba4ebea2# Parent  2ce4b36f1260077179bf6cbc52d6c0738dd547f7
merge of '1cb5c4ca943e9f7ecd09da32a34b562f4e52269d'
     and 'e0d1d5b89727744181eddd937fe7d3ee1dc0603e'

diff -r 8984210fb574 -r 99c3b26bb123 ChangeLog
--- 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
diff -r 8984210fb574 -r 99c3b26bb123 libpurple/request.c
--- 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;