Mercurial > gftp.yaz
diff src/gtk/transfer.c @ 66:cd3e457cbc85
2002-11-26 Brian Masney <masneyb@gftp.org>
* configure.in - change version to 2.0.14rc1
* lib/local.c - fix for uploading files. Move setting of hostname
from local_connect() to local_init()
* lib/misc.c (gftp_request) - copy only select fields over instead of
whole structure
* lib/protocols.c (gftp_request_new) - set datafd and cachefd to -1
* lib/protocols.c (gftp_set_proxy_config) - allow a NULL proxy_config
to be passed
* src/gtk/misc-gtk.c (update_window) - don't show the hostname if we
are connected via the local protocol
* src/gtk/transfer.c (create_transfer) - check to see if this protocol
is always connected
| author | masneyb |
|---|---|
| date | Wed, 27 Nov 2002 02:23:51 +0000 |
| parents | 41b71c4e5076 |
| children | aa971a4bb16f |
line wrap: on
line diff
--- a/src/gtk/transfer.c Tue Nov 26 14:58:13 2002 +0000 +++ b/src/gtk/transfer.c Wed Nov 27 02:23:51 2002 +0000 @@ -1405,8 +1405,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 && + fromreq->sockfd < 0 && fromreq->cached && + (tdata->fromreq->sockfd > 0 || tdata->fromreq->always_connected) && compare_request (tdata->fromreq, fromreq, 0)) { gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, @@ -1460,7 +1460,8 @@ if (!tdata->fromreq->stopable) { if (tdata->fromwdata && - ((gftp_window_data *) tdata->fromwdata)->request->sockfd > 0 && + (((gftp_window_data *) tdata->fromwdata)->request->sockfd > 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)) {