Mercurial > gftp.yaz
diff src/gtk/transfer.c @ 169:d40f9db52cdf
2003-6-8 Brian Masney <masneyb@gftp.org>
* lib/https.c lib/options.h lib/sslcommon.c - make sure USE_SSL is
defined before using any SSL functions
* lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c lib/sslcommon.c
lib/rfc959.c - make sure we use request->datafd for the connection. Removed
sockfd from gftp_request structure
* lib/rfc959.c - add data_connection to rfc959_parms structure. Use
this for the FTP data connection
* src/text/gftp-text.c - fixes for username/password prompt
* src/gtk/misc-gtk.c src/gtk/transfer.c - s/sockfd/datafd/g
* configure.in - added lib/Makefile (forgot to commit last time)
* Makefile.am - added intl to SUBDIRS
| author | masneyb |
|---|---|
| date | Sun, 08 Jun 2003 15:49:02 +0000 |
| parents | 2f15b3000dbc |
| children | 33b394ebba68 |
line wrap: on
line diff
--- a/src/gtk/transfer.c Sun Jun 08 15:04:40 2003 +0000 +++ b/src/gtk/transfer.c Sun Jun 08 15:49:02 2003 +0000 @@ -1206,8 +1206,8 @@ { fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL; if (!tdata->fromreq->stopable && tdata->fromwdata && - ((fromreq->sockfd < 0 && fromreq->cached) || fromreq->always_connected) && - (tdata->fromreq->sockfd > 0 || tdata->fromreq->always_connected) && + ((fromreq->datafd < 0 && fromreq->cached) || fromreq->always_connected) && + (tdata->fromreq->datafd > 0 || tdata->fromreq->always_connected) && compare_request (tdata->fromreq, fromreq, 0)) { gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, @@ -1263,7 +1263,7 @@ if (!tdata->fromreq->stopable) { if (tdata->fromwdata && - (((gftp_window_data *) tdata->fromwdata)->request->sockfd > 0 || + (((gftp_window_data *) tdata->fromwdata)->request->datafd > 0 || ((gftp_window_data *) tdata->fromwdata)->request->always_connected) && !((gftp_window_data *) tdata->fromwdata)->request->stopable && compare_request (tdata->fromreq, ((gftp_window_data *) tdata->fromwdata)->request, 0))