[Commits] [SCM] claws branch, master, updated. 4.1.1-73-g9eb64a780

[paul at claws-mail.org]

The branch, master has been updated
       via  9eb64a780e6761f43e1378dde784c3466f2059ba (commit)
      from  265d0a7dd9797ee1966ac5552a0426b47e1ac20c (commit)

Summary of changes:
 src/compose.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 9eb64a780e6761f43e1378dde784c3466f2059ba
Author: Paul <paul at claws-mail.org>
Date:   Fri Aug 18 07:42:37 2023 +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

diff --git a/src/compose.c b/src/compose.c
index 8141d2546..e3d75e55c 100644
--- 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));

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail