Mercurial > gftp.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 65:4b5fec7711e9 | 66:cd3e457cbc85 |
|---|---|
| 1403 tdata = node->data; | 1403 tdata = node->data; |
| 1404 if (tdata->started) | 1404 if (tdata->started) |
| 1405 { | 1405 { |
| 1406 fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL; | 1406 fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL; |
| 1407 if (!tdata->fromreq->stopable && tdata->fromwdata && | 1407 if (!tdata->fromreq->stopable && tdata->fromwdata && |
| 1408 ((fromreq->sockfd < 0 && fromreq->cached) || | 1408 fromreq->sockfd < 0 && fromreq->cached && |
| 1409 fromreq->always_connected) && tdata->fromreq->sockfd > 0 && | 1409 (tdata->fromreq->sockfd > 0 || tdata->fromreq->always_connected) && |
| 1410 compare_request (tdata->fromreq, fromreq, 0)) | 1410 compare_request (tdata->fromreq, fromreq, 0)) |
| 1411 { | 1411 { |
| 1412 gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, | 1412 gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, |
| 1413 tdata->toreq); | 1413 tdata->toreq); |
| 1414 gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request, | 1414 gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request, |
| 1458 pthread_t tid; | 1458 pthread_t tid; |
| 1459 | 1459 |
| 1460 if (!tdata->fromreq->stopable) | 1460 if (!tdata->fromreq->stopable) |
| 1461 { | 1461 { |
| 1462 if (tdata->fromwdata && | 1462 if (tdata->fromwdata && |
| 1463 ((gftp_window_data *) tdata->fromwdata)->request->sockfd > 0 && | 1463 (((gftp_window_data *) tdata->fromwdata)->request->sockfd > 0 || |
| 1464 ((gftp_window_data *) tdata->fromwdata)->request->always_connected) && | |
| 1464 !((gftp_window_data *) tdata->fromwdata)->request->stopable && | 1465 !((gftp_window_data *) tdata->fromwdata)->request->stopable && |
| 1465 compare_request (tdata->fromreq, ((gftp_window_data *) tdata->fromwdata)->request, 0)) | 1466 compare_request (tdata->fromreq, ((gftp_window_data *) tdata->fromwdata)->request, 0)) |
| 1466 { | 1467 { |
| 1467 gftp_swap_socks (tdata->toreq, | 1468 gftp_swap_socks (tdata->toreq, |
| 1468 ((gftp_window_data *) tdata->towdata)->request); | 1469 ((gftp_window_data *) tdata->towdata)->request); |