use to_human_readable()

This commit is contained in:
Colin Leroy 2004-07-08 11:45:34 +00:00
parent 039506bb9a
commit 0f89ba8260
5 changed files with 20 additions and 8 deletions

View file

@ -1,3 +1,9 @@
2004-07-08 [colin] 0.9.11cvs17.14
* src/messageview.c
* src/common/smtp.c
Use to_human_readable() for sizes
2004-07-08 [colin] 0.9.11cvs17.13
* src/inc.c

View file

@ -7,3 +7,4 @@
( cvs diff -u -r 1.395.2.15 -r 1.395.2.16 src/summaryview.c; cvs diff -u -r 1.204.2.11 -r 1.204.2.12 src/prefs_common.c; cvs diff -u -r 1.103.2.5 -r 1.103.2.6 src/prefs_common.h; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/quicksearch.h; ) > 0.9.11cvs17.11.patchset
( cvs diff -u -r 1.11.2.1 -r 1.11.2.2 src/common/smtp.c; cvs diff -u -r 1.6 -r 1.7 src/common/smtp.h; ) > 0.9.11cvs17.12.patchset
( cvs diff -u -r 1.149.2.7 -r 1.149.2.8 src/inc.c; cvs diff -u -r 1.94.2.8 -r 1.94.2.9 src/messageview.c; cvs diff -u -r 1.56.2.4 -r 1.56.2.5 src/pop.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/pop.h; cvs diff -u -r 1.150.2.4 -r 1.150.2.5 src/procmsg.c; ) > 0.9.11cvs17.13.patchset
( cvs diff -u -r 1.94.2.9 -r 1.94.2.10 src/messageview.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/common/smtp.c; ) > 0.9.11cvs17.14.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=11
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=17.13
EXTRA_VERSION=17.14
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

View file

@ -502,8 +502,9 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
&& smtp_session->max_message_size <
smtp_session->send_data_len) {
log_warning(_("Message is too big "
"(Maximum size is %dKB)\n"),
smtp_session->max_message_size / 1024);
"(Maximum size is %s)\n"),
to_human_readable(
(off_t)(smtp_session->max_message_size / 1024)));
smtp_session->state = SMTP_ERROR;
smtp_session->error_val = SM_ERROR;
return -1;

View file

@ -1064,8 +1064,10 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
gchar *text = NULL;
if (!msginfo->planned_download) {
text = g_strdup_printf(_("This message has been partially "
"retrieved; it is %dKB large."),
msginfo->total_size/1024);
"retrieved; it is %s large."),
to_human_readable(
(off_t)(msginfo->total_size/1024)));
noticeview_set_text(noticeview, text);
g_free(text);
noticeview_set_button_text(noticeview, _("Mark for download"));
@ -1075,9 +1077,11 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
noticeview_show(noticeview);
} else {
text = g_strdup_printf(_("This message has been partially "
"retrieved and is planned for "
"download; it is %dKB large."),
msginfo->total_size/1024);
"retrieved and is planned for "
"download; it is %s large."),
to_human_readable(
(off_t)(msginfo->total_size/1024)));
noticeview_set_text(noticeview, text);
noticeview_set_button_text(noticeview, NULL);
g_free(text);