diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-11-14 22:24:33 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-11-14 22:24:33 +0800 |
| commit | 78a2a77d1079c4790eeef64aa42b034dab172292 (patch) | |
| tree | c5fb4391864ab2784fe293f991d111888c77217b /mail/em-composer-utils.c | |
| parent | 6f391134f0c1c2019bd9c58fced43e0b46c87ab8 (diff) | |
| download | gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar.gz gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar.bz2 gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar.lz gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar.xz gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.tar.zst gsoc2013-evolution-78a2a77d1079c4790eeef64aa42b034dab172292.zip | |
Bug #662914 - Reply to gnupg signed mails should be signed
Diffstat (limited to 'mail/em-composer-utils.c')
| -rw-r--r-- | mail/em-composer-utils.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index b09d3cd4e2..3f851c0991 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1413,17 +1413,23 @@ emu_update_composers_security (EMsgComposer *composer, guint32 validity_found) { GtkToggleAction *action; + EShell *shell; + EShellSettings *shell_settings; g_return_if_fail (composer != NULL); + shell = e_msg_composer_get_shell (composer); + shell_settings = e_shell_get_shell_settings (shell); + /* Pre-set only for encrypted messages, not for signed */ - /*if (validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) { + if ((validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) != 0 + && e_shell_settings_get_boolean (shell_settings, "composer-sign-reply-if-signed")) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_SMIME_SIGN (composer)); else action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_PGP_SIGN (composer)); gtk_toggle_action_set_active (action, TRUE); - }*/ + } if (validity_found & EM_FORMAT_VALIDITY_FOUND_ENCRYPTED) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) |