Mercurial > pidgin3 / changeset

--- a/ChangeLog	Sat Aug 07 18:43:31 2010 +0000
+++ b/ChangeLog	Sat Aug 07 19:51:30 2010 +0000
@@ -25,6 +25,8 @@
 	MSN:
 	* Support for web-based buddy icons, used when a buddy logs in to the
 	  messenger on the Live website.
+	* Fix file transfers with some clients that don't support direct
+	  connections (e.g., papyon, telepathy-butterfly, etc.) (#12150)
 
 	MXit:
 	* Fix filename for the Shocked emoticon. (#12364)

--- a/libpurple/protocols/msn/slp.c	Sat Aug 07 18:43:31 2010 +0000
+++ b/libpurple/protocols/msn/slp.c	Sat Aug 07 19:51:30 2010 +0000
@@ -941,7 +941,8 @@
 	purple_debug_error("msn", "Received non-OK result: %s\n",
 	                   error ? error : "Unknown");
 
-	if (type && !strcmp(type, "application/x-msnmsgr-transreqbody")) {
+	if (type && (!strcmp(type, "application/x-msnmsgr-transreqbody")
+	          || !strcmp(type, "application/x-msnmsgr-transrespbody"))) {
 		MsnDirectConn *dc = slpcall->slplink->dc;
 		if (dc) {
 			msn_dc_fallback_to_sb(dc);