diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-format.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 1dc6d47404..8295067ce3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-10-19 Jeffrey Stedfast <fejj@helixcode.com> + + * mail-format.c (mail_generate_reply): Get the MailConfigIdentity + *before* we create a new composer object so that we can set the + signature file. + 2000-10-18 Michael Meeks <michael@helixcode.com> * folder-browser-factory.c (register_ondemand): kill. diff --git a/mail/mail-format.c b/mail/mail-format.c index 5ae440188a..ccbdf420fd 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1631,6 +1631,10 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) MailConfigIdentity *id; gchar *sig_file = NULL; + id = mail_config_get_default_identity (); + if (id) + sig_file = id->sig; + composer = e_msg_composer_new_with_sig_file (sig_file); if (!composer) return NULL; @@ -1639,10 +1643,6 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) contents = camel_medium_get_content_object (CAMEL_MEDIUM (message)); text = mail_get_message_body (contents, want_plain, &is_html); - id = mail_config_get_default_identity (); - if (id) - sig_file = id->sig; - /* Set the quoted reply text. */ if (text) { char *repl_text; |