diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-17 22:55:48 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-17 22:55:48 +0800 |
| commit | 900d019a0332b24d2bee7ea1407b149fca2c0598 (patch) | |
| tree | 627edf5d63874be616d41c9a043571a80fc542f5 /mail/em-composer-utils.c | |
| parent | cdb09641dc6be772931e5381cdf1e6a824a15684 (diff) | |
| parent | badc11edcf5e73bc6148c7b5cdccee739eb9d7ae (diff) | |
| download | gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.gz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.bz2 gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.lz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.xz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.zst gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.zip | |
Merge branch 'master' into wip/gsettings
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 06db108b8e..85fc96d751 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1412,17 +1412,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) |