talons

commit 305e170b46d2d20c407367e35ba3cf1c2d4f7a1b
parent 2761674cb1c1c82a1ed52793dbdd5a7cb32466dd
Author: Paul <paul@claws-mail.org>
Date:   Sat, 16 Mar 2024 06:14:58 +0000

enable 'Remove references' when forwarding mail

Diffstat:
M
src/compose.c
 | 
17
+++++++++++++++--

1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
  *
  * 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
@@ -1753,6 +1753,16 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 	else
 		mode = COMPOSE_FORWARD;
 	compose = compose_create(account, msginfo->folder, mode, batch);
+
+	cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RemoveReferences", TRUE);
+	cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/RemoveReferences", TRUE);
+
+	if (compose_parse_header(compose, msginfo) < 0) {
+		compose->updating = FALSE;
+		compose_destroy(compose);
+		return NULL;
+	}
+
 	compose_apply_folder_privacy_settings(compose, msginfo->folder);
 
 	compose->updating = TRUE;
@@ -3009,7 +3019,10 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 				compose->folder->stype ==  F_DRAFT)
 			compose->msgid = g_strdup(msginfo->msgid);
 	} else {
-		if (msginfo->msgid && *msginfo->msgid)
+		if (msginfo->msgid && *msginfo->msgid &&
+		    (compose->mode != COMPOSE_FORWARD &&
+		     compose->mode != COMPOSE_FORWARD_INLINE &&
+		     compose->mode != COMPOSE_FORWARD_AS_ATTACH))
 			compose->inreplyto = g_strdup(msginfo->msgid);
 
 		if (!compose->references) {