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-22 15:52:23 +0200
commit5c20a003ad7e925fcfd81af58a4afbcf497ac96d (patch)
treee4b0a0156734abfe6076067122aab4acc9bf0903
parentf1d120de5bfcf7d9c406af925ca826ec7631ee45 (diff)
downloadnautilus-5c20a003ad7e925fcfd81af58a4afbcf497ac96d.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 1d9d3199e..1bbdf8eb6 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1963,8 +1963,8 @@ report_trash_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,