untwist file selection logic - be explicit

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index 693d64a87a231cc3cd91d80999fcabd5ba83f66e..4f6071c8fcb96e219e778ccf0ef2487a147e65ad 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -62,7 +62,7 @@
 #include "stock_pixmap.h"
 #include "hooks.h"
 #include "filtering.h"
-#include "pop.h"
+#include "partial_download.h"
 
 static GList *messageview_list = NULL;
 
@@ -627,7 +627,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
        /* Message ID */
        generate_msgid(account->address, buf, sizeof buf);
-       fprintf(fp, "Message-Id: <%s>\n", buf);
+       fprintf(fp, "Message-ID: <%s>\n", buf);
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");
@@ -725,6 +725,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        textview_set_all_headers(messageview->mimeview->textview, all_headers);
 
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
+       messageview_set_position(messageview, 0);
 
        if (messageview->msginfo->partial_recv)
                partial_recv_show(messageview->noticeview, 
@@ -952,7 +953,7 @@ void messageview_save_as(MessageView *messageview)
                Xstrdup_a(filename, msginfo->subject, return);
                subst_for_filename(filename);
        }
-       dest = filesel_select_file(_("Save as"), filename);
+       dest = filesel_select_file_save(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
@@ -1071,9 +1072,9 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
        void  *button1_cb = NULL;
        void  *button2_cb = NULL;
 
-       if (!pop3_msg_in_uidl_list(msginfo->account_server, msginfo->account_login,
-                                  msginfo->partial_recv))
+       if (!partial_msg_in_uidl_list(msginfo))
                return;
+
        switch (msginfo->planned_download) {
        case POP3_PARTIAL_DLOAD_UNKN:
                text = g_strdup_printf(_("This message has been partially "
@@ -1125,7 +1126,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
 static void partial_recv_dload_clicked(NoticeView *noticeview, 
                                       MsgInfo *msginfo)
 {
-       if (pop3_mark_for_download(msginfo) == 0) {
+       if (partial_mark_for_download(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
 }
@@ -1133,7 +1134,7 @@ static void partial_recv_dload_clicked(NoticeView *noticeview,
 static void partial_recv_del_clicked(NoticeView *noticeview, 
                                       MsgInfo *msginfo)
 {
-       if (pop3_mark_for_delete(msginfo) == 0) {
+       if (partial_mark_for_delete(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
 }
@@ -1141,7 +1142,7 @@ static void partial_recv_del_clicked(NoticeView *noticeview,
 static void partial_recv_unmark_clicked(NoticeView *noticeview, 
                                       MsgInfo *msginfo)
 {
-       if (pop3_unmark(msginfo) == 0) {
+       if (partial_unmark(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
 }