untwist file selection logic - be explicit

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index b0517b0a50dd0f7075bcc74b7696f2924da44815..4f6071c8fcb96e219e778ccf0ef2487a147e65ad 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -62,6 +62,7 @@
 #include "stock_pixmap.h"
 #include "hooks.h"
 #include "filtering.h"
+#include "partial_download.h"
 
 static GList *messageview_list = NULL;
 
@@ -77,6 +78,14 @@ static void return_receipt_show              (NoticeView     *noticeview,
                                         MsgInfo        *msginfo);      
 static void return_receipt_send_clicked (NoticeView    *noticeview, 
                                          MsgInfo        *msginfo);
+static void partial_recv_show          (NoticeView     *noticeview, 
+                                        MsgInfo        *msginfo);      
+static void partial_recv_dload_clicked         (NoticeView     *noticeview, 
+                                         MsgInfo        *msginfo);
+static void partial_recv_del_clicked   (NoticeView     *noticeview, 
+                                         MsgInfo        *msginfo);
+static void partial_recv_unmark_clicked (NoticeView    *noticeview, 
+                                         MsgInfo        *msginfo);
 static void save_as_cb                 (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -618,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");
@@ -716,11 +725,16 @@ 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->dispositionnotificationto || 
+       if (messageview->msginfo->partial_recv)
+               partial_recv_show(messageview->noticeview, 
+                                 messageview->msginfo);
+       else if ((messageview->msginfo->dispositionnotificationto || 
             messageview->msginfo->returnreceiptto) &&
            !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags))
-               return_receipt_show(messageview->noticeview, messageview->msginfo);
+               return_receipt_show(messageview->noticeview, 
+                                   messageview->msginfo);
        else 
                noticeview_hide(messageview->noticeview);
 
@@ -939,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;
@@ -1018,7 +1032,7 @@ void messageview_toggle_view_real(MessageView *messageview)
 
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
-       noticeview_set_text(noticeview, _("This message asks for a return receipt"));
+       noticeview_set_text(noticeview, _("This message asks for a return receipt."));
        noticeview_set_button_text(noticeview, _("Send receipt"));
        noticeview_set_button_press_callback(noticeview,
                                             GTK_SIGNAL_FUNC(return_receipt_send_clicked),
@@ -1050,6 +1064,89 @@ static void return_receipt_send_clicked(NoticeView *noticeview, MsgInfo *msginfo
        g_free(file);
 }
 
+static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
+{
+       gchar *text = NULL;
+       gchar *button1 = NULL;
+       gchar *button2 = NULL;
+       void  *button1_cb = NULL;
+       void  *button2_cb = NULL;
+
+       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 "
+                               "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);
+       g_free(text);
+       noticeview_set_button_text(noticeview, button1);
+       noticeview_set_button_press_callback(noticeview,
+                    GTK_SIGNAL_FUNC(button1_cb), (gpointer) msginfo);
+
+       noticeview_set_2ndbutton_text(noticeview, button2);
+       noticeview_set_2ndbutton_press_callback(noticeview,
+                    GTK_SIGNAL_FUNC(button2_cb), (gpointer) msginfo);
+
+       noticeview_show(noticeview);
+}
+
+static void partial_recv_dload_clicked(NoticeView *noticeview, 
+                                      MsgInfo *msginfo)
+{
+       if (partial_mark_for_download(msginfo) == 0) {
+               partial_recv_show(noticeview, msginfo);
+       }
+}
+
+static void partial_recv_del_clicked(NoticeView *noticeview, 
+                                      MsgInfo *msginfo)
+{
+       if (partial_mark_for_delete(msginfo) == 0) {
+               partial_recv_show(noticeview, msginfo);
+       }
+}
+
+static void partial_recv_unmark_clicked(NoticeView *noticeview, 
+                                      MsgInfo *msginfo)
+{
+       if (partial_unmark(msginfo) == 0) {
+               partial_recv_show(noticeview, msginfo);
+       }
+}
+
 static void select_account_cb(GtkWidget *w, gpointer data)
 {
        *(gint*)data = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(w)));
@@ -1065,7 +1162,9 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
        g_return_val_if_fail(ac_list->data != NULL, NULL);
        
        optmenu = gtk_option_menu_new();
-       menu = gtkut_account_menu_new(ac_list, select_account_cb, &account_id);
+       menu = gtkut_account_menu_new(ac_list, 
+                       G_CALLBACK(select_account_cb), 
+                       &account_id);
        if (!menu)
                return NULL;
        gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
@@ -1104,7 +1203,7 @@ gchar *messageview_get_selection(MessageView *msgview)
        textview = messageview_get_current_textview(msgview);
        g_return_val_if_fail(textview != NULL, NULL);
 
-       edit = GTK_EDITABLE(textview->text);
+       edit = GTK_TEXT_VIEW(textview->text);
        g_return_val_if_fail(edit != NULL, NULL);
        body_pos = textview->body_pos;