/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "defs.h"
#include "addressbook.h"
#include "alertpanel.h"
#include "inputdialog.h"
+#include "mainwindow.h"
#include "manage_window.h"
#include "procmsg.h"
#include "procheader.h"
#include "hooks.h"
#include "filtering.h"
#include "partial_download.h"
+#include "gedit-print.h"
+#include "inc.h"
+#include "log.h"
static GList *messageview_list = NULL;
-static void messageview_destroy_cb (GtkWidget *widget,
- MessageView *messageview);
+static gint messageview_delete_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ MessageView *messageview);
static void messageview_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation);
static gboolean key_pressed (GtkWidget *widget,
static GtkItemFactoryEntry msgview_entries[] =
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
- {N_("/_File/_Save as..."), NULL, save_as_cb, 0, NULL},
- {N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
+ {N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
+ {N_("/_File/_Print..."), "<control>P", print_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), NULL, close_cb, 0, NULL},
+ {N_("/_File/_Close"), "<control>W", close_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Edit/_Copy"), NULL, copy_cb, 0, NULL},
- {N_("/_Edit/Select _all"), NULL, allsel_cb, 0, NULL},
+ {N_("/_Edit/_Copy"), "<control>C", copy_cb, 0, NULL},
+ {N_("/_Edit/Select _all"), "<control>A", allsel_cb, 0, NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Find in current message..."),
- NULL, search_cb, 0, NULL},
+ "<control>F", search_cb, 0, NULL},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
ENC_ACTION(C_ISO_8859_1)},
{N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
ENC_ACTION(C_ISO_8859_15)},
+ {N_("/_View/Character _encoding/Western European (Windows-1252)"),
+ ENC_ACTION(C_WINDOWS_1252)},
ENC_SEPARATOR,
{N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
ENC_ACTION(C_ISO_8859_2)},
{N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
ENC_ACTION(C_ISO_8859_7)},
ENC_SEPARATOR,
+ {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
+ ENC_ACTION(C_ISO_8859_8)},
+ {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
+ ENC_ACTION(C_CP1255)},
+ ENC_SEPARATOR,
+ {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
+ ENC_ACTION(C_ISO_8859_6)},
+ {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
+ ENC_ACTION(C_CP1256)},
+ ENC_SEPARATOR,
{N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
ENC_ACTION(C_ISO_8859_9)},
ENC_SEPARATOR,
ENC_SEPARATOR,
{N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
ENC_ACTION(C_GB2312)},
+ {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+ ENC_ACTION(C_GBK)},
{N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
ENC_ACTION(C_BIG5)},
{N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
#undef DEC_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>"},
+ {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
+ {N_("/_View/Show all _headers"),"<control>H", show_all_header_cb, 0, "<ToggleItem>"},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/Compose _new message"),
- NULL, compose_cb, 0, NULL},
+ "<control>M", compose_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Reply"), NULL, reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/_Message/_Reply"), "<control>R", reply_cb, COMPOSE_REPLY, NULL},
{N_("/_Message/Repl_y to/_all"),
- NULL, reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/_Message/Repl_y to/_sender"),
NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/_Message/Repl_y to/mailing _list"),
- NULL, reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+ "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Forward"), NULL, reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Message/_Forward"), "<control><alt>F", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
{N_("/_Message/For_ward as attachment"),
NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/_Message/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/_Address book"), NULL, addressbook_open_cb, 0, NULL},
+ {N_("/_Tools/_Address book"), "<control><shift>A", addressbook_open_cb, 0, NULL},
{N_("/_Tools/Add sender to address boo_k"),
NULL, add_address_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
gtk_widget_show(menubar);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- handlebox = gtk_handle_box_new();
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ }
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+ gtk_widget_realize(handlebox);
msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
(gpointer)msgview);
{
MessageView *msgview;
GtkWidget *window;
+ static GdkGeometry geometry;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+
+ if (!geometry.min_height) {
+ geometry.min_width = 320;
+ geometry.min_height = 200;
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+
gtk_widget_set_size_request(window, prefs_common.msgwin_width,
prefs_common.msgwin_height);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(messageview_size_allocate_cb),
msgview);
- g_signal_connect(G_OBJECT(window), "destroy",
- G_CALLBACK(messageview_destroy_cb), msgview);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(messageview_delete_cb), msgview);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), msgview);
gchar tmp[MAXPATHLEN + 1];
FILE *fp;
GList *ac_list;
- PrefsAccount *account;
+ PrefsAccount *account = NULL;
gint ok;
gchar *to;
FolderItem *queue, *outbox;
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>"),
AlertValue val;
gchar *message;
message = g_strdup_printf(
- _("The notification address to which the "
- "return receipt is to be sent\n"
- "does not correspond to the return path:\n"
- "Notification address: %s\n"
- "Return path: %s\n"
- "It is advised to not to send the return "
- "receipt."), to, buf);
- val = alertpanel_with_type(_("Warning"), message, _("Send"),
- _("+Don't Send"), NULL, NULL, ALERT_WARNING);
+ _("The notification address to which the return receipt is\n"
+ "to be sent does not correspond to the return path:\n"
+ "Notification address: %s\n"
+ "Return path: %s\n"
+ "It is advised to not to send the return receipt."),
+ to, buf);
+ 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;
}
ac_list = account_find_all_from_address(ac_list, msginfo->cc);
if (ac_list == NULL) {
- alertpanel_error(_("This message is asking for a return "
- "receipt notification\n"
- "but according to its 'To:' and 'CC:' "
- "headers it was not\nofficially addressed "
- "to you.\n"
- "Receipt notification cancelled."));
- return -1;
+ AlertValue val =
+ alertpanel_full(_("Warning"),
+ _("This message is asking for a return receipt notification\n"
+ "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."),
+ _("_Don't Send"), _("_Send"), NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ if (val != G_ALERTALTERNATE)
+ return -1;
}
- if (g_list_length(ac_list) > 1)
- account = select_account_from_list(ac_list);
- else
+ if (g_list_length(ac_list) > 1) {
+ if ((account = select_account_from_list(ac_list)) == NULL)
+ return -1;
+ }
+ else if (ac_list != NULL)
account = (PrefsAccount *) ac_list->data;
g_list_free(ac_list);
if (account == NULL)
+ account = account_get_default();
+ if (!account || account->protocol == A_NNTP) {
+ alertpanel_error(_("Account for sending mail is not specified.\n"
+ "Please select a mail account before sending."));
return -1;
+ }
/* write to temporary file */
g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%d",
get_rc_dir(), G_DIR_SEPARATOR, (gint)msginfo);
- if ((fp = fopen(tmp, "wb")) == NULL) {
+ if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
return -1;
}
g_free(path);
}
- fprintf(fp, "\n");
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
/* Date */
get_rfc822_date(buf, sizeof(buf));
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
- unlink(tmp);
+ g_unlink(tmp);
return -1;
}
if (!queue) queue = folder_get_default_queue();
if (!queue) {
g_warning("can't find queue folder\n");
- unlink(tmp);
+ g_unlink(tmp);
return -1;
}
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
g_warning("can't queue the message\n");
- unlink(tmp);
+ g_unlink(tmp);
return -1;
}
- if (prefs_common.work_offline)
- if (alertpanel(_("Offline warning"),
- _("You're working offline. Override?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
- return 0;
+ 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 *file;
MimeInfo *mimeinfo, *encinfo;
-
+ 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);
}
headerview_show(messageview->headerview, messageview->msginfo);
- messageview->all_headers = all_headers;
- textview_set_all_headers(messageview->mimeview->textview, all_headers);
+ textview_set_all_headers(messageview->mimeview->textview,
+ messageview->all_headers);
mimeview_show_message(messageview->mimeview, mimeinfo, file);
+
+ if (messageview->window)
+ gtk_window_set_title(GTK_WINDOW(messageview->window),
+ _("Sylpheed-Claws - Message View"));
+ if (messageview->window && msginfo->subject) {
+ subject = g_strdup(msginfo->subject);
+ if (!g_utf8_validate(subject, -1, NULL)) {
+ g_free(subject);
+ subject = g_malloc(strlen(msginfo->subject)*2 +1);
+ conv_localetodisp(subject, strlen(msginfo->subject)*2 +1,
+ msginfo->subject);
+ }
+ if (g_utf8_validate(subject, -1, NULL))
+ gtk_window_set_title(GTK_WINDOW(messageview->window),
+ subject);
+ g_free(subject);
+ }
+
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);
msgview_list = g_list_remove(msgview_list, messageview);
+ if (messageview->window)
+ gtk_widget_destroy(messageview->window);
g_free(messageview);
}
if (msginfo && msgview->msginfo &&
msginfo->msgnum == msgview->msginfo->msgnum &&
msginfo->folder == msgview->msginfo->folder) {
- summary_delete(msgview->mainwin->summaryview);
+ summary_delete_trash(msgview->mainwin->summaryview);
} else {
msginfo = msgview->msginfo;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree,
summaryview->selected);
- g_return_if_fail(msginfo != NULL);
+ if (msginfo == NULL)
+ return;
messageview_show(msgview, msginfo,
msgview->all_headers);
gboolean messageview_is_visible(MessageView *messageview)
{
+ if (messageview == NULL)
+ return FALSE;
return messageview->visible;
}
aval = alertpanel(_("Overwrite"),
_("Overwrite existing file?"),
- GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
- if (G_ALERTDEFAULT != aval) return;
+ GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
+ if (G_ALERTALTERNATE != aval) return;
}
src = procmsg_get_message_file(msginfo);
if (copy_file(src, dest, TRUE) < 0) {
tmp = g_path_get_basename(dest);
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
g_free(tmp);
}
g_free(dest);
g_free(src);
}
-static void messageview_destroy_cb(GtkWidget *widget, MessageView *messageview)
+static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
+ MessageView *messageview)
{
messageview_destroy(messageview);
+ return TRUE;
}
static void messageview_size_allocate_cb(GtkWidget *widget,
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
MessageView *messageview)
{
- if (event && event->keyval == GDK_Escape && messageview->window)
- gtk_widget_destroy(messageview->window);
+ if (event && event->keyval == GDK_Escape && messageview->window) {
+ messageview_destroy(messageview);
+ return TRUE;
+ }
+
+ if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+ return FALSE;
+
+ g_signal_stop_emission_by_name(G_OBJECT(widget),
+ "key_press_event");
+ mimeview_pass_key_press_event(messageview->mimeview, event);
return FALSE;
}
static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
{
+ if (msginfo->folder
+ && (folder_has_parent_of_type(msginfo->folder, F_QUEUE)
+ || folder_has_parent_of_type(msginfo->folder, F_DRAFT)))
+ return;
+
noticeview_set_text(noticeview, _("This message asks for a return receipt."));
noticeview_set_button_text(noticeview, _("Send receipt"));
noticeview_set_button_press_callback(noticeview,
"accounts.\n"
"Please choose which account do you want to "
"use for sending the receipt notification:"),
- _("Send Notification"), _("+Cancel"), NULL,
+ _("_Send Notification"), _("+_Cancel"), NULL,
optmenu) != G_ALERTDEFAULT)
return NULL;
return account_find_from_id(account_id);
static void print_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
- gchar *cmdline;
+#ifndef USE_GNOMEPRINT
+ gchar *cmdline = NULL;
gchar *p;
+#endif
if (!messageview->msginfo) return;
-
+#ifndef USE_GNOMEPRINT
cmdline = input_dialog(_("Print"),
_("Enter the print command line:\n"
- "(`%s' will be replaced with file name)"),
+ "('%s' will be replaced with file name)"),
prefs_common.print_cmd);
if (!cmdline) return;
if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
strchr(p + 2, '%')) {
- alertpanel_error(_("Print command line is invalid:\n`%s'"),
+ alertpanel_error(_("Print command line is invalid:\n'%s'"),
cmdline);
g_free(cmdline);
return;
}
-
procmsg_print_message(messageview->msginfo, cmdline);
g_free(cmdline);
+#else
+ if (!messageview->mimeview
+ || !messageview->mimeview->textview
+ || !messageview->mimeview->textview->text)
+ alertpanel_warning(_("Cannot print: the message doesn't "
+ "contain text."));
+
+ gedit_print(
+ GTK_TEXT_VIEW(messageview->mimeview
+ ->textview->text));
+#endif
}
static void close_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
- gtk_widget_destroy(messageview->window);
+ messageview_destroy(messageview);
}
static void copy_cb(gpointer data, guint action, GtkWidget *widget)
MessageView *messageview = (MessageView *)data;
MsgInfo *msginfo = messageview->msginfo;
+ messageview->all_headers =
+ GTK_CHECK_MENU_ITEM(widget)->active;
if (!msginfo) return;
messageview->msginfo = NULL;
messageview_show(messageview, msginfo,
{
MessageView *messageview = (MessageView *)data;
GSList *msginfo_list = NULL;
- MsgInfo *msginfo;
g_return_if_fail(messageview->msginfo);
if (!messageview->msginfo) return;
msginfo = messageview->msginfo;
if (!msginfo->folder) return;
- if (msginfo->folder->stype != F_OUTBOX &&
- msginfo->folder->stype != F_DRAFT &&
- msginfo->folder->stype != F_QUEUE) return;
+ if (!folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
+ !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
+ !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);
+}