comparison src/gtk/transfer.c @ 309:cc2eeb30b793

2003-11-7 Brian Masney <masneyb@gftp.org> * lib/gftp.h lib/local.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c - added copy_param_options method to gftp_request structure. When a gftp_request structure is copied, if a copy_param_options method exists, this will be called so that the local protocol data can be copied over. This is only used by the FTP protocol at the moment to save the current state of Ascii or Binary transfers. * src/gtk/transfer.c (transfer_done) - when a transfer is completed, copy the local protocol options back to the main window * lib/rfc959.c (gftp_set_data_type) - check the return value of rfc959_send_command() and if there is an error, return that error. * configure.in - added 'hr' to ALL_LINGUAS
author masneyb
date Sat, 08 Nov 2003 12:23:21 +0000
parents 6d180e6a8ba5
children 2ad0b9a00fdd
comparison
equal deleted inserted replaced
308:758d9d648cc0 309:cc2eeb30b793
1225 { 1225 {
1226 fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL; 1226 fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL;
1227 1227
1228 if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->fromwdata, 1228 if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->fromwdata,
1229 tdata->fromreq)) 1229 tdata->fromreq))
1230 gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request, 1230 {
1231 tdata->fromreq); 1231 gftp_copy_param_options (((gftp_window_data *) tdata->fromwdata)->request, tdata->fromreq);
1232
1233 gftp_swap_socks (((gftp_window_data *) tdata->fromwdata)->request,
1234 tdata->fromreq);
1235 }
1232 else 1236 else
1233 gftp_disconnect (tdata->fromreq); 1237 gftp_disconnect (tdata->fromreq);
1234 1238
1235 if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->towdata, 1239 if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->towdata,
1236 tdata->toreq)) 1240 tdata->toreq))
1237 gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request, 1241 {
1238 tdata->toreq); 1242 gftp_copy_param_options (((gftp_window_data *) tdata->towdata)->request, tdata->toreq);
1243
1244 gftp_swap_socks (((gftp_window_data *) tdata->towdata)->request,
1245 tdata->toreq);
1246 }
1239 else 1247 else
1240 gftp_disconnect (tdata->toreq); 1248 gftp_disconnect (tdata->toreq);
1241 1249
1242 if (tdata->towdata != NULL && compare_request (tdata->toreq, 1250 if (tdata->towdata != NULL && compare_request (tdata->toreq,
1243 ((gftp_window_data *) tdata->towdata)->request, 1)) 1251 ((gftp_window_data *) tdata->towdata)->request, 1))