summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shpilkin <ashpilkin@gmail.com>2016-03-18 12:13:46 +0100
committerCarlos Soriano <csoriano@gnome.org>2016-04-14 11:41:08 +0200
commit76bfc989aa3410faa76835d08a679625d986d192 (patch)
treecfdd7dce2e5a9985a9a66e3af906beadeb702007
parent2ab8c235fbe47ab363335615f341d7b6a953517e (diff)
downloadnautilus-76bfc989aa3410faa76835d08a679625d986d192.tar.gz
file-operations: fix formatting of delete progress
A simple operator precedence mishap prevented the deletion rate during long deletion operations from being displayed properly. Also, the formatting of the message is subtly different from the others of this kind because we don't have a predefined formatting token for a file count, and it ended up missing a space character. https://bugzilla.gnome.org/show_bug.cgi?id=759986
-rw-r--r--libnautilus-private/nautilus-file-operations.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 09140d1e0..1d9d3199e 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1567,8 +1567,8 @@ report_delete_progress (CommonJob *job,
seconds_count_format_time_units (remaining_time));
files_per_second_message = ngettext ("(%d file/sec)",
"(%d files/sec)",
- (int) transfer_rate + 0.5);
- concat_detail = g_strconcat (time_left_message, files_per_second_message, NULL);
+ (int)(transfer_rate + 0.5));
+ concat_detail = g_strconcat (time_left_message, " ", files_per_second_message, NULL);
details = f (concat_detail,
transfer_info->num_files + 1, source_info->num_files,