Mercurial > gftp.yaz
changeset 770:eeb471438232
2006-7-19 Brian Masney <masneyb@gftp.org>
* src/gtk/transfer.c (remove_file) - fixes for when the viewed file can
be removed if an invalid program is specified (closes #330182)
| author | masneyb |
|---|---|
| date | Thu, 20 Jul 2006 01:28:53 +0000 |
| parents | 4ad80d524dda |
| children | d966cf89a820 |
| files | ChangeLog src/gtk/transfer.c |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 20 01:20:58 2006 +0000 +++ b/ChangeLog Thu Jul 20 01:28:53 2006 +0000 @@ -1,4 +1,7 @@ 2006-7-19 Brian Masney <masneyb@gftp.org> + * src/gtk/transfer.c (remove_file) - fixes for when the viewed file can + be removed if an invalid program is specified (closes #330182) + * lib/sslcommon.c - added support for wildcard SSL certificates (from Kai Blaschke <webmaster@thw-theorie.de>) (closes #339663) @@ -3419,7 +3422,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.441 2006/07/20 01:20:58 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.442 2006/07/20 01:28:48 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/transfer.c Thu Jul 20 01:20:58 2006 +0000 +++ b/src/gtk/transfer.c Thu Jul 20 01:28:53 2006 +0000 @@ -254,14 +254,17 @@ static void -remove_file (char *filename) +remove_file (gftp_viewedit_data * ve_proc) { - if (unlink (filename) == 0) + if (ve_proc->remote_filename == NULL) + return; + + if (unlink (ve_proc->filename) == 0) ftp_log (gftp_logging_misc, NULL, _("Successfully removed %s\n"), - filename); + ve_proc->filename); else ftp_log (gftp_logging_error, NULL, - _("Error: Could not remove file %s: %s\n"), filename, + _("Error: Could not remove file %s: %s\n"), ve_proc->filename, g_strerror (errno)); } @@ -287,7 +290,7 @@ static void dont_upload (gftp_viewedit_data * ve_proc, gftp_dialog_data * ddata) { - remove_file (ve_proc->filename); + remove_file (ve_proc); free_edit_data (ve_proc); } @@ -350,7 +353,7 @@ ftp_log (gftp_logging_error, NULL, _("Error: Child %d returned %d\n"), pid, procret); if (ve_proc->view) - remove_file (ve_proc->filename); + remove_file (ve_proc); continue; } else @@ -376,7 +379,7 @@ ftp_log (gftp_logging_misc, NULL, _("File %s was not changed\n"), ve_proc->filename); - remove_file (ve_proc->filename); + remove_file (ve_proc); } else {