aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-hdrs.c2
-rw-r--r--composer/e-msg-composer.c8
3 files changed, 13 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 6a1f530640..3e204c2ff1 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-09 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (from_changed_cb): Set the smime/pgp
+ always-sign options when here so it updates when the user changes
+ his/her identity.
+
2001-08-08 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index fe11b8c6d6..916d8014c0 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -740,7 +740,7 @@ e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,
omenu = GTK_OPTION_MENU (hdrs->priv->from.entry);
default_account = mail_config_get_default_account_num ();
-
+
/* find the item that represents the account and activate it */
l = hdrs->priv->from_options;
while (l) {
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index aac2d45cc9..072ebc7f8f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1888,13 +1888,17 @@ hdrs_changed_cb (EMsgComposerHdrs *hdrs,
}
static void
-from_changed_cb (EMsgComposerHdrs *hdrs,
- void *data)
+from_changed_cb (EMsgComposerHdrs *hdrs, void *data)
{
EMsgComposer *composer;
composer = E_MSG_COMPOSER (data);
+ if (hdrs->account) {
+ e_msg_composer_set_pgp_sign (composer, hdrs->account->pgp_always_sign);
+ e_msg_composer_set_smime_sign (composer, hdrs->account->smime_always_sign);
+ }
+
e_msg_composer_show_sig_file (composer);
}