# HG changeset patch # User masneyb # Date 1160931736 0 # Node ID 251682017c9773fe7f923ac76d50aa9fa6d851e2 # Parent 92ba2b1e144a9fae8cbbb8008e22929ad14de7f7 2006-10-15 Brian Masney * src/gtk/delete_dialog.c (askdel) - fixes displaying the proper number of directories that will be deleted to the user when there are no files to delete * src/uicommon/gftpui.c - removed debugging statements diff -r 92ba2b1e144a -r 251682017c97 ChangeLog --- a/ChangeLog Sun Oct 15 16:25:01 2006 +0000 +++ b/ChangeLog Sun Oct 15 17:02:16 2006 +0000 @@ -1,4 +1,10 @@ 2006-10-15 Brian Masney + * src/gtk/delete_dialog.c (askdel) - fixes displaying the proper number + of directories that will be deleted to the user when there are no files + to delete + + * src/uicommon/gftpui.c - removed debugging statements + * lib/protocols.c (gftp_get_all_subdirs) - use S_ISDIR macro instead of checking the bitmask against S_IFDIR. @@ -3616,7 +3622,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.481 2006/10/15 16:25:00 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.482 2006/10/15 17:02:14 masneyb Exp $ tags * debian/* - updated files from Debian maintainer diff -r 92ba2b1e144a -r 251682017c97 src/gtk/delete_dialog.c --- a/src/gtk/delete_dialog.c Sun Oct 15 16:25:01 2006 +0000 +++ b/src/gtk/delete_dialog.c Sun Oct 15 17:02:16 2006 +0000 @@ -66,7 +66,7 @@ } else if (transfer->numdirs > 0) { - tempstr = g_strdup_printf (_("Are you sure you want to delete these %ld directories"), transfer->numfiles, transfer->numdirs); + tempstr = g_strdup_printf (_("Are you sure you want to delete these %ld directories"), transfer->numdirs); } else return; diff -r 92ba2b1e144a -r 251682017c97 src/uicommon/gftpui.c --- a/src/uicommon/gftpui.c Sun Oct 15 16:25:01 2006 +0000 +++ b/src/uicommon/gftpui.c Sun Oct 15 17:02:16 2006 +0000 @@ -1470,7 +1470,6 @@ g_static_mutex_lock (&tdata->structmutex); curfle = tdata->curfle->data; -printf ("FIXME - transferring %s\n", curfle->file); tdata->current_file_number++; if (g_thread_supported ()) @@ -1553,19 +1552,9 @@ int gftpui_common_transfer_files (gftp_transfer * tdata) { - gftp_file * curfle; int ret; tdata->curfle = tdata->files; - while (tdata->curfle != NULL) - { - curfle = tdata->curfle->data; - printf ("FILE: %s\n", curfle->file); - tdata->curfle = tdata->curfle->next; - } - - - tdata->curfle = tdata->files; gettimeofday (&tdata->starttime, NULL); memcpy (&tdata->lasttime, &tdata->starttime, sizeof (tdata->lasttime));