nautilus r14991 - in trunk: . libnautilus-private

[cosimoc svn gnome org]

Author: cosimoc
Date: Sun Feb 22 22:10:22 2009
New Revision: 14991
URL: http://svn.gnome.org/viewvc/nautilus?rev=14991&view=rev

Log:
2009-02-22  Cosimo Cecchi  <cosimoc gnome org>

	* 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).


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Sun Feb 22 22:10:22 2009
@@ -228,7 +228,7 @@
 
 	if (seconds < 60*60) {
 		/* minutes */
-		minutes = (seconds + 30) / 60;
+		minutes = seconds / 60;
 		return minutes;
 	}
 
@@ -236,7 +236,7 @@
 
 	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 @@
 	}
 
 	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 @@
 	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);