Mercurial > pidgin
changeset 32502:967354280e86
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)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 13 Feb 2012 03:11:11 +0000 |
| parents | b9ae9bcf252d |
| children | 0f1367d534a6 |
| files | libpurple/protocols/oscar/peer.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/peer.c Mon Feb 13 03:05:53 2012 +0000 +++ b/libpurple/protocols/oscar/peer.c Mon Feb 13 03:11:11 2012 +0000 @@ -708,13 +708,13 @@ { 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,