diff options
| author | Federico Mena Quintero <federico@novell.com> | 2006-05-08 23:03:02 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2006-05-08 23:03:02 +0000 |
| commit | 8d0d4c119c16e91bd0b303e5c64360c7967504b1 (patch) | |
| tree | 3d2c5d71667b8ae68bca890096e8d81d98a65d7e | |
| parent | c2528bf84dd5b31ac4c26ca9e0335bdf1040e9ba (diff) | |
| download | nautilus-8d0d4c119c16e91bd0b303e5c64360c7967504b1.tar.gz | |
Don't special-case the first 0 bytes of the file in the case of reporting
2006-05-08 Federico Mena Quintero <federico@novell.com>
* libnautilus-private/nautilus-file-operations.c
(handle_transfer_ok): Don't special-case the first 0 bytes of the
file in the case of reporting actual copy/move progress. It is
fine to update both the labels and the sizes every time. Fixes
http://bugzilla.gnome.org/show_bug.cgi?id=341064
https://bugzilla.novell.com/show_bug.cgi?id=66073
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 27 |
2 files changed, 20 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2006-05-08 Federico Mena Quintero <federico@novell.com> + + * libnautilus-private/nautilus-file-operations.c + (handle_transfer_ok): Don't special-case the first 0 bytes of the + file in the case of reporting actual copy/move progress. It is + fine to update both the labels and the sizes every time. Fixes + http://bugzilla.gnome.org/show_bug.cgi?id=341064 + https://bugzilla.novell.com/show_bug.cgi?id=66073 + 2006-05-08 Martin Wehner <martin.wehner@gmail.com> * src/nautilus-places-sidebar.c: (add_place), (update_places), diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 050165407..4b7dbfd37 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -575,22 +575,17 @@ handle_transfer_ok (const GnomeVFSXferProgressInfo *progress_info, /* fall through */ case GNOME_VFS_XFER_PHASE_COPYING: if (transfer_info->progress_dialog != NULL) { - if (progress_info->bytes_copied == 0) { - progress_dialog_set_to_from_item_text - (transfer_info->progress_dialog, - transfer_info->progress_verb, - progress_info->source_name, - progress_info->target_name, - progress_info->file_index, - progress_info->file_size); - } else { - nautilus_file_operations_progress_update_sizes - (transfer_info->progress_dialog, - MIN (progress_info->bytes_copied, - progress_info->bytes_total), - MIN (progress_info->total_bytes_copied, - progress_info->bytes_total)); - } + progress_dialog_set_to_from_item_text (transfer_info->progress_dialog, + transfer_info->progress_verb, + progress_info->source_name, + progress_info->target_name, + progress_info->file_index, + progress_info->file_size); + nautilus_file_operations_progress_update_sizes (transfer_info->progress_dialog, + MIN (progress_info->bytes_copied, + progress_info->bytes_total), + MIN (progress_info->total_bytes_copied, + progress_info->bytes_total)); } return 1; |