i'm a bit slow, sometimes.

diff --git a/PATCHSETS b/PATCHSETS
index 3e852b74cf9b28ada14babdf8141751b7ce9a1af..2f28f9f51d55d9503b5af144d6f111740c773047 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -7,4 +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.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
+( cvs diff -u -r 1.94.2.9 -r 1.94.2.11 src/messageview.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.4 src/common/smtp.c; ) > 0.9.11cvs17.14.patchset

diff --git a/src/common/smtp.c b/src/common/smtp.c
index 715c3d199df2fb76d6cbb5e15bd12184994fad45..dd3f069e446a72ffdf3de2992b20e45905c1b7a7 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -504,7 +504,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                        log_warning(_("Message is too big "
                              "(Maximum size is %s)\n"),
                              to_human_readable(
                        log_warning(_("Message is too big "
                              "(Maximum size is %s)\n"),
                              to_human_readable(

-                              (off_t)(smtp_session->max_message_size / 1024)));
+                              (off_t)(smtp_session->max_message_size)));

                        smtp_session->state = SMTP_ERROR;
                        smtp_session->error_val = SM_ERROR;
                        return -1;
                        smtp_session->state = SMTP_ERROR;
                        smtp_session->error_val = SM_ERROR;
                        return -1;

diff --git a/src/messageview.c b/src/messageview.c
index 2943c512e9d57ee48316bb1ab7471a221ac50e0d..7c000ff4deccb9e79a7d81de65e35eac2c27a5c3 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1066,7 +1066,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                text = g_strdup_printf(_("This message has been partially "
                                 "retrieved; it is %s large."), 
                                 to_human_readable(
                text = g_strdup_printf(_("This message has been partially "
                                 "retrieved; it is %s large."), 
                                 to_human_readable(

-                                       (off_t)(msginfo->total_size/1024)));
+                                       (off_t)(msginfo->total_size)));

 
                noticeview_set_text(noticeview, text);
                g_free(text);
 
                noticeview_set_text(noticeview, text);
                g_free(text);


@@ -1080,7 +1080,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                                 "retrieved and is planned for "
                                 "download; it is %s large."), 
                                 to_human_readable(
                                 "retrieved and is planned for "
                                 "download; it is %s large."), 
                                 to_human_readable(

-                                       (off_t)(msginfo->total_size/1024)));
+                                       (off_t)(msginfo->total_size)));

 
                noticeview_set_text(noticeview, text);
                noticeview_set_button_text(noticeview, NULL);
 
                noticeview_set_text(noticeview, text);
                noticeview_set_button_text(noticeview, NULL);