[evolution/gnome-3-38] I#1262 - Composer: Forward -> Redirect includes account signature

[Milan Crha <mcrha src gnome org>]

commit 35a0f3d8edc28f0f12f14c72cc2501d2ba26aab5
Author: Milan Crha <mcrha redhat com>
Date:   Mon Dec 7 16:19:07 2020 +0100

    I#1262 - Composer: Forward -> Redirect includes account signature
    
    Hide the signature part on the redirect and make sure the signature
    is not added into the message body.
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1262

 src/composer/e-composer-header-table.c | 4 ++--
 src/composer/e-msg-composer.c          | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/composer/e-composer-header-table.c b/src/composer/e-composer-header-table.c
index 70b67b3b97..779abe617d 100644
--- a/src/composer/e-composer-header-table.c
+++ b/src/composer/e-composer-header-table.c
@@ -916,12 +916,12 @@ composer_header_table_constructed (GObject *object)
 
        e_binding_bind_property (
                table->priv->headers[ii]->input_widget, "visible",
-               table->priv->signature_label, "visible",
+               table->priv->signature_combo_box, "visible",
                G_BINDING_SYNC_CREATE);
 
        e_binding_bind_property (
-               table->priv->headers[ii]->input_widget, "visible",
                table->priv->signature_combo_box, "visible",
+               table->priv->signature_label, "visible",
                G_BINDING_SYNC_CREATE);
 
        /* Now add the signature stuff. */
diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
index 5138ba96a8..7793577d33 100644
--- a/src/composer/e-msg-composer.c
+++ b/src/composer/e-msg-composer.c
@@ -4199,16 +4199,18 @@ e_msg_composer_setup_redirect (EMsgComposer *composer,
        g_return_if_fail (E_IS_MSG_COMPOSER (composer));
        g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 
+       composer->priv->redirect = g_object_ref (message);
+
        e_msg_composer_setup_with_message (composer, message, TRUE, identity_uid, alias_name, alias_address, 
cancellable);
 
        table = e_msg_composer_get_header_table (composer);
        subject = camel_mime_message_get_subject (message);
 
-       composer->priv->redirect = message;
-       g_object_ref (message);
-
        e_composer_header_table_set_subject (table, subject);
 
+       gtk_widget_hide (GTK_WIDGET (e_composer_header_table_get_signature_combo_box (table)));
+       gtk_table_set_col_spacings (GTK_TABLE (table), 0);
+
        editor = e_msg_composer_get_editor (composer);
        cnt_editor = e_html_editor_get_content_editor (editor);
        e_content_editor_set_editable (cnt_editor, FALSE);