pidgin: 9ac3dc3d: We don't need to abort the file transfer...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 9ac3dc3dac01d52f74ef1da3fe9122a233650e5a
Parent:   4b5c688e1486f88c95bbe6946367a00b2d1e02dd
Author:   markdoliner at pidgin.im
Date:     02/12/12 22:11:11
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9ac3dc3dac01d52f74ef1da3fe9122a233650e5a

Changelog: 

We don't need to abort the file transfer attempt entirely when this happens.
We can just try the next connection method (both users connect to a 3rd
party proxy)

Changes against parent 4b5c688e1486f88c95bbe6946367a00b2d1e02dd

  patched  libpurple/protocols/oscar/peer.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/peer.c	0e19198622f14fb139bdff8e711d7d931f2e74ca
+++ libpurple/protocols/oscar/peer.c	274221f71ecc335dea0a10e68dde1c8d7c2cb157
@@ -708,13 +708,13 @@ peer_connection_establish_listener_cb(in
 	{
 		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
 		if (ip_atoi == NULL) {
-			purple_debug_error("oscar", "Cannot send file. "
-					"purple_network_ip_atoi(%s) returned NULL. "
+			purple_debug_error("oscar", "Can't ask peer to connect to us "
+					"because purple_network_ip_atoi(%s) returned NULL. "
 					"fd=%d. is_ssl=%d\n",
-					listener_ip ? listener_ip : "(null!)",
+					listener_ip ? listener_ip : "(null)",
 					bos_conn->gsc ? bos_conn->gsc->fd : bos_conn->fd,
 					bos_conn->gsc ? 1 : 0);
-			purple_xfer_cancel_local(conn->xfer);
+			peer_connection_trynext(conn);
 			return;
 		}
 		aim_im_sendch2_sendfile_requestdirect(od,