From dd76899065b447243c76284104733c6d2c9b280d Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 4 Dec 2006 07:57:44 +0000 Subject: [PATCH] 2006-12-04 [colin] 2.6.0cvs82 * src/common/utils.c Probably fix bug 1066, 'Incorrect mailbox size displayed' --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/utils.c | 6 +++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7731dac27..5fcbf367b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-04 [colin] 2.6.0cvs82 + + * src/common/utils.c + Probably fix bug 1066, 'Incorrect mailbox + size displayed' + 2006-12-04 [colin] 2.6.0cvs81 * src/common/utils.c diff --git a/PATCHSETS b/PATCHSETS index 7eaec8d7f..adb6a3a1f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2106,3 +2106,4 @@ ( cvs diff -u -r 1.25.2.14 -r 1.25.2.15 tools/Makefile.am; ) > 2.6.0cvs79.patchset ( cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/exphtmldlg.c; cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/expldifdlg.c; ) > 2.6.0cvs80.patchset ( cvs diff -u -r 1.36.2.90 -r 1.36.2.91 src/common/utils.c; ) > 2.6.0cvs81.patchset +( cvs diff -u -r 1.36.2.91 -r 1.36.2.92 src/common/utils.c; ) > 2.6.0cvs82.patchset diff --git a/configure.ac b/configure.ac index d2b4bc2f0..2ed4cad76 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=81 +EXTRA_VERSION=82 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/utils.c b/src/common/utils.c index 1dd271887..54f06ca1a 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -351,14 +351,14 @@ gchar *to_human_readable(off_t size) gb_format = _("%.2fGB"); } - if (size < 1024) { + if (size < (off_t)1024) { g_snprintf(str, sizeof(str), b_format, (gint)size); return str; - } else if (size >> 10 < 1024) { + } else if (size >> 10 < (off_t)1024) { divide(size, 10, t, r); g_snprintf(str, sizeof(str), kb_format, t, r); return str; - } else if (size >> 20 < 1024) { + } else if (size >> 20 < (off_t)1024) { divide(size, 20, t, r); g_snprintf(str, sizeof(str), mb_format, t, r); return str; -- 2.25.1