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 /modules | |
| parent | cdb09641dc6be772931e5381cdf1e6a824a15684 (diff) | |
| parent | badc11edcf5e73bc6148c7b5cdccee739eb9d7ae (diff) | |
| download | gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.gz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.zst gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/e-mail-shell-settings.c | 4 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 5cc70efdbd..8c845bddf8 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -324,6 +324,10 @@ e_mail_shell_settings_init (EShellBackend *shell_backend) "composer-group-reply-to-list"); e_shell_settings_install_property_for_key ( + "composer-sign-reply-if-signed", + "/apps/evolution/mail/composer/sign_reply_if_signed"); + + e_shell_settings_install_property_for_key ( "composer-prompt-only-bcc", MAIL_SCHEMA, "prompt-on-only-bcc"); diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 8453b88540..4f4c0d15ac 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -456,6 +456,13 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); + widget = e_builder_get_widget (prefs->builder, "chkSignReplyIfSigned"); + g_object_bind_property ( + shell_settings, "composer-sign-reply-if-signed", + widget, "active", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + widget = e_builder_get_widget (prefs->builder, "chkTopSignature"); g_object_bind_property ( shell_settings, "composer-top-signature", |