comparison src/gtk/transfer.c @ 143:5c952c5cb438

2003-4-23 Brian Masney <masneyb@gftp.org> * Makefile.am - removed config.rpath from EXTRA_DIST * configure.in - added 'sr' to ALL_LINGUAS. Incremented version to 2.0.15 (will be a little while before this is released. Still have lots to do) * docs/sample.gftp/gftprc - removed old unused SSH options. These were used by the SSH protocol I ripped out * lib/config_file.c - fix for gftp_set_request_option(). Implemented gftp_lookup_request_options(). Overriding of configuration options now works across the board :) * lib/protocols.c - extra checks for freeing memory * src/text/gftp-text.c - renamed ssh_use_sftp_subsys to the proper name of sshv2_use_sftp_subsys * src/gtk/transfer.c - renamed append_file_transfers option to the proper name of append_transfers. Also, added quick fix for start_file_transfers option that is still missing * debian/gftp-text.postinst - this will add add an alternative for the ftp command and point it to gftp-text
author masneyb
date Thu, 24 Apr 2003 02:21:58 +0000
parents 84b3e69807a2
children 2f15b3000dbc
comparison
equal deleted inserted replaced
142:3671d5325b7e 143:5c952c5cb438
763 void 763 void
764 add_file_transfer (gftp_request * fromreq, gftp_request * toreq, 764 add_file_transfer (gftp_request * fromreq, gftp_request * toreq,
765 gftp_window_data * fromwdata, gftp_window_data * towdata, 765 gftp_window_data * fromwdata, gftp_window_data * towdata,
766 GList * files, int copy_req) 766 GList * files, int copy_req)
767 { 767 {
768 int dialog, append_file_transfers; 768 int dialog, append_transfers;
769 gftp_curtrans_data * transdata; 769 gftp_curtrans_data * transdata;
770 GList * templist, *curfle; 770 GList * templist, *curfle;
771 gftp_transfer * tdata; 771 gftp_transfer * tdata;
772 gftp_file * tempfle; 772 gftp_file * tempfle;
773 char *pos, *text[2]; 773 char *pos, *text[2];
778 if (tempfle->startsize > 0) 778 if (tempfle->startsize > 0)
779 break; 779 break;
780 } 780 }
781 dialog = templist != NULL; 781 dialog = templist != NULL;
782 782
783 gftp_lookup_request_option (fromreq, "append_file_transfers", 783 gftp_lookup_request_option (fromreq, "append_transfers",
784 &append_file_transfers); 784 &append_transfers);
785 785
786 if (append_file_transfers) 786 if (append_transfers)
787 { 787 {
788 pthread_mutex_lock (&transfer_mutex); 788 pthread_mutex_lock (&transfer_mutex);
789 for (templist = gftp_file_transfers; templist != NULL; templist = templist->next) 789 for (templist = gftp_file_transfers; templist != NULL; templist = templist->next)
790 { 790 {
791 tdata = templist->data; 791 tdata = templist->data;
1427 1427
1428 if (tdata->curfle != NULL) 1428 if (tdata->curfle != NULL)
1429 { 1429 {
1430 gftp_lookup_global_option ("do_one_transfer_at_a_time", 1430 gftp_lookup_global_option ("do_one_transfer_at_a_time",
1431 &do_one_transfer_at_a_time); 1431 &do_one_transfer_at_a_time);
1432 gftp_lookup_global_option ("start_file_transfers", /* FIXME - this is gone now */ 1432 start_file_transfers = 1; /* FIXME */
1433 &start_file_transfers);
1434 1433
1435 if (!tdata->started && start_file_transfers && 1434 if (!tdata->started && start_file_transfers &&
1436 (num_transfers_in_progress == 0 || !do_one_transfer_at_a_time)) 1435 (num_transfers_in_progress == 0 || !do_one_transfer_at_a_time))
1437 create_transfer (tdata); 1436 create_transfer (tdata);
1438 1437