[balsa/69-resend-message: 111/111] sendmsg-window: Cleanup after rebase

[Peter Bloomfield <peterb src gnome org>]

commit 864145749a4d8fbd2ead6508cd8ecee5e9f06cea
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Oct 9 22:13:34 2022 -0400

    sendmsg-window: Cleanup after rebase

 src/sendmsg-window.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index e6e7ef329..77ef88d73 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -5144,12 +5144,12 @@ bsmsg2message(BalsaSendmsg * bsmsg)
         libbalsa_message_append_part(message, body);
 
         if (balsa_app.has_openpgp || balsa_app.has_smime) {
-            libbalsa_message_set_gpg_mode(message,
-                (bsmsg->gpg_mode & LIBBALSA_PROTECT_MODE) != 0 ? bsmsg->gpg_mode : 0);
+            libbalsa_message_set_crypt_mode(message,
+                (bsmsg->crypt_mode & LIBBALSA_PROTECT_MODE) != 0 ? bsmsg->crypt_mode : 0);
             libbalsa_message_set_attach_pubkey(message, bsmsg->attach_pubkey);
             libbalsa_message_set_identity(message, ident);
         } else {
-            libbalsa_message_set_gpg_mode(message, 0);
+            libbalsa_message_set_crypt_mode(message, 0);
             libbalsa_message_set_attach_pubkey(message, FALSE);
         }
     }
@@ -5161,17 +5161,6 @@ bsmsg2message(BalsaSendmsg * bsmsg)
     }
 
     headers->date = time(NULL);
-    if (balsa_app.has_openpgp || balsa_app.has_smime) {
-        libbalsa_message_set_crypt_mode(message,
-            (bsmsg->crypt_mode & LIBBALSA_PROTECT_MODE) != 0 ? bsmsg->crypt_mode : LIBBALSA_PROTECT_NONE);
-        libbalsa_message_set_attach_pubkey(message, bsmsg->attach_pubkey);
-        libbalsa_message_set_always_trust(message, bsmsg->always_trust);
-        libbalsa_message_set_identity(message, ident);
-    } else {
-        libbalsa_message_set_crypt_mode(message, LIBBALSA_PROTECT_NONE);
-        libbalsa_message_set_attach_pubkey(message, FALSE);
-        libbalsa_message_set_always_trust(message, FALSE);
-    }
 
     /* remember the parent window */
     g_object_set_data(G_OBJECT(message), "parent-window",