From ee0b2f7910b39a37f056a7015484779b3f89c914 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 22 Feb 2009 22:10:22 +0000 Subject: [PATCH] don't add 30 seconds when formatting time, as float->int conversion 2009-02-22 Cosimo Cecchi * libnautilus-private/nautilus-file-operations.c (seconds_count_format_time_units), (format_time): don't add 30 seconds when formatting time, as float->int conversion already truncates the value for us (#572284). svn path=/trunk/; revision=14991 --- ChangeLog | 7 +++++++ libnautilus-private/nautilus-file-operations.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b00f4df3f..05e8b6c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-02-22 Cosimo Cecchi + + * libnautilus-private/nautilus-file-operations.c + (seconds_count_format_time_units), (format_time): + don't add 30 seconds when formatting time, as float->int conversion + already truncates the value for us (#572284). + 2009-02-21 Cosimo Cecchi * configure.in: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 0dc2ce0fb..1e888896f 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -228,7 +228,7 @@ seconds_count_format_time_units (int seconds) if (seconds < 60*60) { /* minutes */ - minutes = (seconds + 30) / 60; + minutes = seconds / 60; return minutes; } @@ -236,7 +236,7 @@ seconds_count_format_time_units (int seconds) if (seconds < 60*60*4) { /* minutes + hours */ - minutes = (seconds - hours * 60 * 60 + 30) / 60; + minutes = (seconds - hours * 60 * 60) / 60; return minutes + hours; } @@ -260,7 +260,7 @@ format_time (int seconds) } if (seconds < 60*60) { - minutes = (seconds + 30) / 60; + minutes = seconds / 60; return g_strdup_printf (ngettext ("%'d minute", "%'d minutes", minutes), minutes); } @@ -269,7 +269,7 @@ format_time (int seconds) if (seconds < 60*60*4) { char *h, *m; - minutes = (seconds - hours * 60 * 60 + 30) / 60; + minutes = (seconds - hours * 60 * 60) / 60; h = g_strdup_printf (ngettext ("%'d hour", "%'d hours", hours), hours); m = g_strdup_printf (ngettext ("%'d minute", "%'d minutes", minutes), minutes); -- GitLab