| b1fc7992 |
1 | =================================================================== |
| 2 | RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v |
| 3 | retrieving revision 1.207 |
| 4 | retrieving revision 1.207.2.1 |
| 5 | diff -u -r1.207 -r1.207.2.1 |
| 6 | --- nautilus-file-operations.c 2006/03/20 15:47:55 1.207 |
| 7 | +++ libnautilus-private/nautilus-file-operations.c 2006/05/08 23:05:30 1.207.2.1 |
| 8 | @@ -575,22 +575,17 @@ |
| 9 | /* fall through */ |
| 10 | case GNOME_VFS_XFER_PHASE_COPYING: |
| 11 | if (transfer_info->progress_dialog != NULL) { |
| 12 | - if (progress_info->bytes_copied == 0) { |
| 13 | - progress_dialog_set_to_from_item_text |
| 14 | - (transfer_info->progress_dialog, |
| 15 | - transfer_info->progress_verb, |
| 16 | - progress_info->source_name, |
| 17 | - progress_info->target_name, |
| 18 | - progress_info->file_index, |
| 19 | - progress_info->file_size); |
| 20 | - } else { |
| 21 | - nautilus_file_operations_progress_update_sizes |
| 22 | - (transfer_info->progress_dialog, |
| 23 | - MIN (progress_info->bytes_copied, |
| 24 | - progress_info->bytes_total), |
| 25 | - MIN (progress_info->total_bytes_copied, |
| 26 | - progress_info->bytes_total)); |
| 27 | - } |
| 28 | + progress_dialog_set_to_from_item_text (transfer_info->progress_dialog, |
| 29 | + transfer_info->progress_verb, |
| 30 | + progress_info->source_name, |
| 31 | + progress_info->target_name, |
| 32 | + progress_info->file_index, |
| 33 | + progress_info->file_size); |
| 34 | + nautilus_file_operations_progress_update_sizes (transfer_info->progress_dialog, |
| 35 | + MIN (progress_info->bytes_copied, |
| 36 | + progress_info->bytes_total), |
| 37 | + MIN (progress_info->total_bytes_copied, |
| 38 | + progress_info->bytes_total)); |
| 39 | } |
| 40 | return 1; |
| 41 | |
projects / packages / nautilus.git / blame