[evolution] Bug 759151 - Always preserve sign/encrypt settings in composer

[Milan Crha <mcrha src gnome org>]

commit 71455c7984d83ff27af4082f206aa6f01794e3a5
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 20 23:05:09 2016 +0100

    Bug 759151 - Always preserve sign/encrypt settings in composer

 composer/e-msg-composer.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 13ef230..188ac12 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1624,8 +1624,6 @@ msg_composer_subject_changed_cb (EMsgComposer *composer)
 static void
 msg_composer_mail_identity_changed_cb (EMsgComposer *composer)
 {
-       EHTMLEditor *editor;
-       EHTMLEditorView *view;
        EMailSignatureComboBox *combo_box;
        ESourceMailComposition *mc;
        ESourceOpenPGP *pgp;
@@ -1639,7 +1637,6 @@ msg_composer_mail_identity_changed_cb (EMsgComposer *composer)
        gboolean pgp_encrypt;
        gboolean smime_sign;
        gboolean smime_encrypt;
-       gboolean is_message_from_edit_as_new;
        const gchar *extension_name;
        const gchar *uid, *active_signature_id;
 
@@ -1673,32 +1670,23 @@ msg_composer_mail_identity_changed_cb (EMsgComposer *composer)
                        composer->priv->mime_type,
                        "text/calendar", 13) != 0);
 
-       editor = e_msg_composer_get_editor (composer);
-       view = e_html_editor_get_view (editor);
-       is_message_from_edit_as_new =
-               e_html_editor_view_is_message_from_edit_as_new (view);
-
        action = GTK_TOGGLE_ACTION (ACTION (PGP_SIGN));
        active = gtk_toggle_action_get_active (action);
-       active &= is_message_from_edit_as_new;
        active |= (can_sign && pgp_sign);
        gtk_toggle_action_set_active (action, active);
 
        action = GTK_TOGGLE_ACTION (ACTION (PGP_ENCRYPT));
        active = gtk_toggle_action_get_active (action);
-       active &= is_message_from_edit_as_new;
        active |= pgp_encrypt;
        gtk_toggle_action_set_active (action, active);
 
        action = GTK_TOGGLE_ACTION (ACTION (SMIME_SIGN));
        active = gtk_toggle_action_get_active (action);
-       active &= is_message_from_edit_as_new;
        active |= (can_sign && smime_sign);
        gtk_toggle_action_set_active (action, active);
 
        action = GTK_TOGGLE_ACTION (ACTION (SMIME_ENCRYPT));
        active = gtk_toggle_action_get_active (action);
-       active &= is_message_from_edit_as_new;
        active |= smime_encrypt;
        gtk_toggle_action_set_active (action, active);