talons

Fork of Claws Mail https://www.claws-mail
Log | Files | Refs | README | LICENSE

commit 9eb64a780e6761f43e1378dde784c3466f2059ba
parent 265d0a7dd9797ee1966ac5552a0426b47e1ac20c
Author: Paul <paul@claws-mail.org>
Date:   Fri, 18 Aug 2023 07:42:37 +0100

when redirecting, disable queueing because re-editing a redirected msg allows changing it. Also disable the Attachments context menu so that it is not possible to remove an attachment from a redirected msg

Diffstat:
Msrc/compose.c | 7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/compose.c b/src/compose.c @@ -2578,11 +2578,11 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo, compose_colorize_signature(compose); - cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Add", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", FALSE); + cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/SendLater", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/Save", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertFile", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/AttachFile", FALSE); @@ -2593,6 +2593,8 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo, cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/ShowRuler", FALSE); cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/Actions", FALSE); + if (compose->toolbar->sendl_btn) + gtk_widget_set_sensitive(compose->toolbar->sendl_btn, FALSE); if (compose->toolbar->draft_btn) gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE); if (compose->toolbar->insert_btn) @@ -10156,7 +10158,8 @@ static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event, gint attach_nr_selected; GtkTreePath *path; - if (!event) return FALSE; + if (!event || compose->redirect_filename != NULL) + return FALSE; if (event->button == 3) { attach_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));