diff options
| author | Milan Crha <mcrha@redhat.com> | 2016-01-20 23:05:09 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2016-01-20 23:09:13 +0100 |
| commit | f7fc79de693c4bfd594709d14660d7f4bc1e466f (patch) | |
| tree | 824f87c21bf218e8b04d649f1afcb83b46b823c5 | |
| parent | 9a67fdd0cb21d5d43d6c015891459b9b1625bf02 (diff) | |
| download | evolution-f7fc79de693c4bfd594709d14660d7f4bc1e466f.tar.gz | |
Bug 759151 - Always preserve sign/encrypt settings in composer
| -rw-r--r-- | 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 8880885836..0966df72bd 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1593,8 +1593,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; @@ -1608,7 +1606,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; @@ -1642,32 +1639,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); |