Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/yahoo_filexfer.c @ 20208:63b1ce39965c
applied changes from 7f71045586c32cffc40f836f3fba92c693adda57
through 24d76e86b06c5b1ab5f0a3ea37bd69ced034e0d0
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 15:37:10 +0000 |
| parents | 44b4e8bd759b |
| children | f379a2e9e939 |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Sep 28 15:36:48 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Sep 28 15:37:10 2007 +0000 @@ -281,13 +281,9 @@ } } } else { - /* TODO: Using xfer->fd like this is probably a bad thing... */ + xfer->fd = -1; if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port, - yahoo_receivefile_connected, xfer) == NULL) - xfer->fd = -1; - else - xfer->fd = 0; - if (xfer->fd == -1) { + yahoo_receivefile_connected, xfer) == NULL) { purple_notify_error(gc, NULL, _("File Transfer Failed"), _("Unable to establish file descriptor.")); purple_xfer_cancel_remote(xfer);