#include "addressbook.h"
#include "alertpanel.h"
#include "inputdialog.h"
+#include "mainwindow.h"
#include "manage_window.h"
#include "procmsg.h"
#include "procheader.h"
#include "partial_download.h"
#include "gedit-print.h"
#include "inc.h"
+#include "log.h"
static GList *messageview_list = NULL;
gchar *path;
gchar *addr;
gchar *addrp;
-
+ gchar *foo = NULL;
if ((!msginfo->returnreceiptto) &&
(!msginfo->dispositionnotificationto))
return -1;
gchar *to_addr = g_strdup(to);
extract_address(to_addr);
extract_address(buf);
- ok = strcmp(to_addr, buf);
+ ok = strcasecmp(to_addr, buf);
g_free(to_addr);
} else {
strncpy(buf, _("<No Return-Path found>"),
"Return path: %s\n"
"It is advised to not to send the return receipt."),
to, buf);
- val = alertpanel_full(_("Warning"), message, _("_Send"),
- _("+_Don't Send"), NULL, FALSE,
- NULL, ALERT_WARNING, G_ALERTALTERNATE);
+ val = alertpanel_full(_("Warning"), message,
+ _("_Don't Send"), _("_Send"), NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(message);
- if (val != G_ALERTDEFAULT)
+ if (val != G_ALERTALTERNATE)
return -1;
}
"but according to its 'To:' and 'CC:' headers it was not\n"
"officially addressed to you.\n"
"It is advised to not to send the return receipt."),
- _("_Send"), _("+_Don't Send"),NULL, FALSE,
- NULL, ALERT_WARNING, G_ALERTALTERNATE);
- if (val != G_ALERTDEFAULT)
+ _("_Don't Send"), _("_Send"), NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ if (val != G_ALERTALTERNATE)
return -1;
}
g_free(path);
}
- fprintf(fp, "\n");
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
/* Date */
get_rfc822_date(buf, sizeof(buf));
return -1;
}
- if (prefs_common.work_offline && !inc_offline_should_override())
+ if (prefs_common.work_offline &&
+ !inc_offline_should_override(
+ _("Sylpheed-Claws needs network access in order "
+ "to send this email.")))
return 0;
/* send it */
path = folder_item_fetch_msg(queue, num);
- ok = procmsg_send_message_queue(path);
+ ok = procmsg_send_message_queue(path, &foo);
g_free(path);
+ g_free(foo);
folder_item_remove_msg(queue, num);
return ok;
gchar *subject = NULL;
g_return_val_if_fail(msginfo != NULL, -1);
+ if (messageview->toolbar)
+ toolbar_set_learn_button
+ (messageview->toolbar,
+ MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+ else
+ toolbar_set_learn_button
+ (messageview->mainwin->toolbar,
+ MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+
+ if (messageview->toolbar) {
+ if (messageview->toolbar->learn_ham_btn)
+ gtk_widget_set_sensitive(
+ messageview->toolbar->learn_ham_btn,
+ procmsg_spam_can_learn());
+ if (messageview->toolbar->learn_spam_btn)
+ gtk_widget_set_sensitive(
+ messageview->toolbar->learn_spam_btn,
+ procmsg_spam_can_learn());
+ }
+ messageview->updating = TRUE;
mimeinfo = procmime_scan_message(msginfo);
+ messageview->updating = FALSE;
+
+ if (messageview->deferred_destroy) {
+ messageview_destroy(messageview);
+ return 0;
+ }
+
if (!mimeinfo) {
textview_show_error(messageview->mimeview->textview);
return -1;
while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
debug_print("decrypting message part\n");
- if (privacy_mimeinfo_decrypt(encinfo) < 0)
+ if (privacy_mimeinfo_decrypt(encinfo) < 0) {
+ alertpanel_error(_("Couldn't decrypt: %s"),
+ privacy_get_error());
break;
+ }
}
+ messageview->updating = TRUE;
file = procmsg_get_message_file_path(msginfo);
+ messageview->updating = FALSE;
+
+ if (messageview->deferred_destroy) {
+ g_free(file);
+ messageview_destroy(messageview);
+ return 0;
+ }
+
if (!file) {
g_warning("can't get message file path.\n");
procmime_mimeinfo_free_all(mimeinfo);
textview_show_error(messageview->mimeview->textview);
return -1;
}
-
+
if (messageview->msginfo != msginfo) {
procmsg_msginfo_free(messageview->msginfo);
messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
messageview_set_position(messageview, 0);
+ main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
+
if (messageview->msginfo->partial_recv)
partial_recv_show(messageview->noticeview,
messageview->msginfo);
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);
+ strcmp(mimeinfo->subtype, "plain"))) {
+ if (strcmp(mimeinfo->subtype, "html"))
+ mimeview_show_part(messageview->mimeview,mimeinfo);
+ else if (prefs_common.invoke_plugin_on_html)
+ mimeview_show_part(messageview->mimeview,mimeinfo);
}
g_free(file);
debug_print("destroy messageview\n");
messageview_list = g_list_remove(messageview_list, messageview);
- hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+ if (!messageview->deferred_destroy) {
+ hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
messageview->msginfo_update_callback_id);
+ }
+
+ if (messageview->updating) {
+ debug_print("uh oh, better not touch that now\n");
+ messageview->deferred_destroy = TRUE;
+ gtk_widget_hide(messageview->window);
+ return;
+ }
headerview_destroy(messageview->headerview);
mimeview_destroy(messageview->mimeview);
!folder_has_parent_of_type(msginfo->folder, F_QUEUE))
return;
- compose_reedit(msginfo);
+ compose_reedit(msginfo, FALSE);
}
static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
messageview->mimeview->textview->show_all_headers);
}
}
+
+void messageview_learn (MessageView *msgview, gboolean is_spam)
+{
+ if (is_spam) {
+ if (procmsg_spam_learner_learn(msgview->msginfo, NULL, TRUE) == 0)
+ procmsg_msginfo_set_flags(msgview->msginfo, MSG_SPAM, 0);
+ else
+ log_error(_("An error happened while learning.\n"));
+
+ } else {
+ if (procmsg_spam_learner_learn(msgview->msginfo, NULL, FALSE) == 0)
+ procmsg_msginfo_unset_flags(msgview->msginfo, MSG_SPAM, 0);
+ else
+ log_error(_("An error happened while learning.\n"));
+ }
+ if (msgview->toolbar)
+ toolbar_set_learn_button
+ (msgview->toolbar,
+ MSG_IS_SPAM(msgview->msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+ else
+ toolbar_set_learn_button
+ (msgview->mainwin->toolbar,
+ MSG_IS_SPAM(msgview->msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+}
projects / claws.git / blobdiff