Commit ea1f2b16 authored by Pavel Cisler's avatar Pavel Cisler Committed by Pavel Cisler

Part 2 of fix for 1549 - Empty trash doesn't update progress properly.

2000-07-13  Pavel Cisler <pavel@eazel.com>

	* src/file-manager/dfos-xfer.c: (handle_xfer_ok):
	Part 2 of fix for 1549 - Empty trash doesn't update progress
	properly.
parent a3141da4
2000-07-13 Pavel Cisler <pavel@eazel.com>
* src/file-manager/dfos-xfer.c: (handle_xfer_ok):
Part 2 of fix for 1549 - Empty trash doesn't update progress
properly.
2000-07-13 J Shane Culpepper <pepper@eazel.com>
*
......
......@@ -157,11 +157,30 @@ handle_xfer_ok (const GnomeVFSXferProgressInfo *progress_info,
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_DELETESOURCE:
nautilus_file_changes_consume_changes (FALSE);
if (xfer_info->progress_dialog != NULL) {
dfos_xfer_progress_dialog_new_file
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
progress_info->source_name,
progress_info->target_name,
"", NULL,
progress_info->file_index,
progress_info->file_size);
dfos_xfer_progress_dialog_update
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
MIN (progress_info->bytes_copied,
progress_info->bytes_total),
MIN (progress_info->total_bytes_copied,
progress_info->bytes_total));
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_OPENSOURCE:
case GNOME_VFS_XFER_PHASE_OPENTARGET:
nautilus_file_changes_consume_changes (FALSE);
/* fall through */
case GNOME_VFS_XFER_PHASE_COPYING:
......
......@@ -157,11 +157,30 @@ handle_xfer_ok (const GnomeVFSXferProgressInfo *progress_info,
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_DELETESOURCE:
nautilus_file_changes_consume_changes (FALSE);
if (xfer_info->progress_dialog != NULL) {
dfos_xfer_progress_dialog_new_file
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
progress_info->source_name,
progress_info->target_name,
"", NULL,
progress_info->file_index,
progress_info->file_size);
dfos_xfer_progress_dialog_update
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
MIN (progress_info->bytes_copied,
progress_info->bytes_total),
MIN (progress_info->total_bytes_copied,
progress_info->bytes_total));
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_OPENSOURCE:
case GNOME_VFS_XFER_PHASE_OPENTARGET:
nautilus_file_changes_consume_changes (FALSE);
/* fall through */
case GNOME_VFS_XFER_PHASE_COPYING:
......
......@@ -157,11 +157,30 @@ handle_xfer_ok (const GnomeVFSXferProgressInfo *progress_info,
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_DELETESOURCE:
nautilus_file_changes_consume_changes (FALSE);
if (xfer_info->progress_dialog != NULL) {
dfos_xfer_progress_dialog_new_file
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
progress_info->source_name,
progress_info->target_name,
"", NULL,
progress_info->file_index,
progress_info->file_size);
dfos_xfer_progress_dialog_update
(DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog),
MIN (progress_info->bytes_copied,
progress_info->bytes_total),
MIN (progress_info->total_bytes_copied,
progress_info->bytes_total));
}
return TRUE;
case GNOME_VFS_XFER_PHASE_MOVING:
case GNOME_VFS_XFER_PHASE_OPENSOURCE:
case GNOME_VFS_XFER_PHASE_OPENTARGET:
nautilus_file_changes_consume_changes (FALSE);
/* fall through */
case GNOME_VFS_XFER_PHASE_COPYING:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment