inform user when mail isn't on server anymore
authorColin Leroy <colin@colino.net>
Thu, 29 Jul 2004 08:04:42 +0000 (08:04 +0000)
committerColin Leroy <colin@colino.net>
Thu, 29 Jul 2004 08:04:42 +0000 (08:04 +0000)
ChangeLog.claws
PATCHSETS
configure.ac
src/messageview.c

index 43ee067..51705aa 100644 (file)
@@ -1,3 +1,10 @@
+2004-07-29 [colin]     0.9.12cvs39
+
+       * src/messageview.c
+               Inform the user when a partially 
+               downloaded mail isn't on the server
+               anymore (due to Mark for deletion)
+
 2004-07-29 [colin]     0.9.12cvs38
 
        * src/messageview.c
index 1f1cdbb..9d967ee 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -25,3 +25,4 @@
 ( cvs diff -u -r 1.24 -r 1.25 src/msgcache.c; ) > 0.9.12cvs36.patchset
 ( cvs diff -u -r 1.25 -r 1.26 src/msgcache.c; ) > 0.9.12cvs37.patchset
 ( cvs diff -u -r 1.120 -r 1.121 src/messageview.c; ) > 0.9.12cvs38.patchset
+( cvs diff -u -r 1.121 -r 1.122 src/messageview.c; ) > 0.9.12cvs39.patchset
index d5b2d32..b91a153 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 2012943..ccbae12 100644 (file)
@@ -1065,44 +1065,46 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
        void  *button2_cb = NULL;
 
        if (!partial_msg_in_uidl_list(msginfo)) {
-               /* in case it was there from previous mail */
-               noticeview_hide(noticeview);
-               return;
-       }
-
-       switch (msginfo->planned_download) {
-       case POP3_PARTIAL_DLOAD_UNKN:
                text = g_strdup_printf(_("This message has been partially "
-                               "retrieved;\nit is %s."),
-                               to_human_readable(
-                                       (off_t)(msginfo->total_size)));
-               button1 = _("Mark for download");
-               button2 = _("Mark for deletion");
-               button1_cb = partial_recv_dload_clicked;
-               button2_cb = partial_recv_del_clicked;
-               break;
-       case POP3_PARTIAL_DLOAD_DLOAD:
-               text = g_strdup_printf(_("This message has been partially "
-                               "retrieved;\nit is %s and will be downloaded."),
-                               to_human_readable(
-                                       (off_t)(msginfo->total_size)));
-               button1 = _("Unmark");
-               button1_cb = partial_recv_unmark_clicked;
-               button2 = _("Mark for deletion");
-               button2_cb = partial_recv_del_clicked;
-               break;
-       case POP3_PARTIAL_DLOAD_DELE:
-               text = g_strdup_printf(_("This message has been partially "
-                               "retrieved;\nit is %s and will be deleted."),
-                               to_human_readable(
-                                       (off_t)(msginfo->total_size)));
-               button1 = _("Mark for download");
-               button1_cb = partial_recv_dload_clicked;
-               button2 = _("Unmark");
-               button2_cb = partial_recv_unmark_clicked;
-               break;
-       default:
-               return;
+                               "retrieved,\nand has been deleted from the "
+                               "server."));
+       } else {
+               switch (msginfo->planned_download) {
+               case POP3_PARTIAL_DLOAD_UNKN:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Mark for download");
+                       button2 = _("Mark for deletion");
+                       button1_cb = partial_recv_dload_clicked;
+                       button2_cb = partial_recv_del_clicked;
+                       break;
+               case POP3_PARTIAL_DLOAD_DLOAD:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s and "
+                                       "will be downloaded."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Unmark");
+                       button1_cb = partial_recv_unmark_clicked;
+                       button2 = _("Mark for deletion");
+                       button2_cb = partial_recv_del_clicked;
+                       break;
+               case POP3_PARTIAL_DLOAD_DELE:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s and "
+                                       "will be deleted."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Mark for download");
+                       button1_cb = partial_recv_dload_clicked;
+                       button2 = _("Unmark");
+                       button2_cb = partial_recv_unmark_clicked;
+                       break;
+               default:
+                       return;
+               }
        }
        
        noticeview_set_text(noticeview, text);