#include "prefs_account.h"
#include "gtkutils.h"
#include "utils.h"
-#include "rfc2015.h"
#include "send_message.h"
#include "stock_pixmap.h"
#include "hooks.h"
#include "filtering.h"
+#include "partial_download.h"
static GList *messageview_list = NULL;
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);
static void set_charset_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void set_decode_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void view_source_cb (gpointer data,
guint action,
GtkWidget *widget);
#undef CODESET_SEPARATOR
#undef CODESET_ACTION
+#define DECODE_SEPARATOR \
+ {N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"}
+#define DECODE_ACTION(action) \
+ NULL, set_decode_cb, action, "/View/Decode/Auto detect"
+ {N_("/_View/Decode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Decode/_Auto detect"),
+ NULL, set_decode_cb, 0, "<RadioItem>"},
+ {N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/Decode/_8bit"), DECODE_ACTION(ENC_8BIT)},
+ {N_("/_View/Decode/_Quoted printable"), DECODE_ACTION(ENC_QUOTED_PRINTABLE)},
+ {N_("/_View/Decode/_Base64"), DECODE_ACTION(ENC_BASE64)},
+ {N_("/_View/Decode/_Uuencode"), DECODE_ACTION(ENC_X_UUENCODE)},
+
+#undef DECODE_SEPARATOR
+#undef DECODE_ACTION
+
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Mess_age source"), NULL, view_source_cb, 0, NULL},
{N_("/_View/Show all _headers"),NULL, show_all_header_cb, 0, "<ToggleItem>"},
GtkWidget *vbox;
GtkWidget *menubar;
GtkWidget *statusbar;
- GtkItemFactory *ifactory;
guint n_menu_entries;
vbox = gtk_vbox_new(FALSE, 0);
"Return path: %s\n"
"It is advised to not to send the return "
"receipt."), to, buf);
- val = alertpanel(_("Warning"), message, _("Send"),
- _("+Don't Send"), NULL);
+ val = alertpanel_with_type(_("Warning"), message, _("Send"),
+ _("+Don't Send"), NULL, NULL, ALERT_WARNING);
g_free(message);
if (val != G_ALERTDEFAULT)
return -1;
fprintf(fp, "Subject: Disposition notification: %s\n", buf);
/* Message ID */
- generate_msgid(account->address, buf, sizeof buf);
- fprintf(fp, "Message-Id: <%s>\n", buf);
+ generate_msgid(buf, sizeof(buf));
+ fprintf(fp, "Message-ID: <%s>\n", buf);
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
if (messageview->msginfo != msginfo) {
procmsg_msginfo_free(messageview->msginfo);
messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
+ if (!messageview->msginfo)
+ messageview->msginfo = procmsg_msginfo_copy(msginfo);
}
headerview_show(messageview->headerview, messageview->msginfo);
mimeview_show_message(messageview->mimeview, mimeinfo, file);
- 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);
+ mimeinfo = procmime_mimeinfo_next(mimeinfo);
+ if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT ||
+ (strcmp(mimeinfo->subtype, "plain") &&
+ strcmp(mimeinfo->subtype, "html")))) {
+ mimeview_show_part(messageview->mimeview,mimeinfo);
+ }
+
g_free(file);
return 0;
void messageview_destroy(MessageView *messageview)
{
- GtkWidget *mimeview = GTK_WIDGET_PTR(messageview->mimeview);
-
debug_print("destroy messageview\n");
messageview_list = g_list_remove(messageview_list, 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),
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)) {
+ text = g_strdup_printf(_("This message has been partially "
+ "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);
+ 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)));
charset = conv_get_charset_str((CharSet)action);
g_free(messageview->forced_charset);
messageview->forced_charset = g_strdup(charset);
+ procmime_force_charset(charset);
+
+ messageview_show(messageview, messageview->msginfo, FALSE);
+ }
+}
+
+static void set_decode_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ MessageView *messageview = (MessageView *)data;
+ if (GTK_CHECK_MENU_ITEM(widget)->active) {
+ messageview->forced_encoding = (EncodingType)action;
+
messageview_show(messageview, messageview->msginfo, FALSE);
+
+ debug_print("forced encoding: %d\n", action);
}
}
+
static void view_source_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
static void reply_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
- GSList *mlist = NULL;
+ GSList *msginfo_list = NULL;
MsgInfo *msginfo;
- gchar *text = NULL;
- ComposeMode mode = (ComposeMode)action;
- TextView *textview;
- msginfo = messageview->msginfo;
- mlist = g_slist_append(NULL, msginfo);
-
- textview = messageview_get_current_textview(messageview);
- text = gtkut_editable_get_selection
- (GTK_EDITABLE(textview->text));
- if (text && *text == '\0') {
- g_free(text);
- text = NULL;
- }
+ g_return_if_fail(messageview->msginfo);
- switch (mode) {
- case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, prefs_common.default_reply_list, FALSE, text);
- break;
- case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, prefs_common.default_reply_list, FALSE, text);
- break;
- case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, prefs_common.default_reply_list, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_SENDER:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_FOLLOWUP_AND_REPLY_TO:
- compose_followup_and_reply_to(msginfo,
- prefs_common.reply_with_quote,
- FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
- break;
- case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_LIST:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
- break;
- case COMPOSE_FORWARD:
- if (prefs_common.forward_as_attachment) {
- compose_reply_mode(COMPOSE_FORWARD_AS_ATTACH, mlist, text);
- return;
- } else {
- compose_reply_mode(COMPOSE_FORWARD_INLINE, mlist, text);
- return;
- }
- break;
- case COMPOSE_FORWARD_INLINE:
- compose_forward(NULL, msginfo, FALSE, text, FALSE);
- break;
- case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward_multiple(NULL, mlist);
- break;
- case COMPOSE_REDIRECT:
- compose_redirect(NULL, msginfo);
- break;
- default:
- g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
- }
-
- /* summary_set_marks_selected(summaryview); */
- g_free(text);
- g_slist_free(mlist);
+ msginfo_list = g_slist_append(msginfo_list, messageview->msginfo);
+ compose_reply_from_messageview(messageview, msginfo_list, action);
+ g_slist_free(msginfo_list);
}
static void reedit_cb(gpointer data, guint action, GtkWidget *widget)
GtkItemFactory *ifactory;
GtkWidget *menuitem;
- if (!messageview && !messageview->new_window)
+ if (!messageview || !messageview->new_window)
return;
/* do some smart things */
if (!messageview->menubar) return;