pidgin: 455ed060: Fall back to SB when a DC is declined vi...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 455ed060dc389723f89e793a60ed1da1e48fe3d9
Parent:   1a137b149f51de86a24007cd6bca0fb3266b0157
Author:   qulogic at pidgin.im
Date:     08/07/10 15:51:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/455ed060dc389723f89e793a60ed1da1e48fe3d9

Changelog: 

Fall back to SB when a DC is declined via transrespbody also.

Fixes #12150.

Changes against parent 1a137b149f51de86a24007cd6bca0fb3266b0157

  patched  ChangeLog
  patched  libpurple/protocols/msn/slp.c

-------------- next part --------------
============================================================
--- ChangeLog	96bc1807ec81b7bd697e25f43d5b43aea3342a33
+++ ChangeLog	6e9abe5b856c7b5158cdd26204f32163abbfdc5d
@@ -25,6 +25,8 @@ version 2.7.3 (??/??/????):
 	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)
============================================================
--- libpurple/protocols/msn/slp.c	e6a651f5bb0e8a5fbe054a5382a46e32a85659c8
+++ libpurple/protocols/msn/slp.c	02105528e7422e5afa37fdcdaf6342d91b60d2eb
@@ -941,7 +941,8 @@ got_error(MsnSlpCall *slpcall,
 	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);