diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 12 | ||||
| -rw-r--r-- | mail/mail-format.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f2c91243c1..061b214f61 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2000-11-08 Radek Doulik <rodo@helixcode.com> + + * mail-format.c (mail_generate_reply): likewise + + * mail-callbacks.c (create_msg_composer): added send_html arg to + e_msg_composer_new_with_sig_file call + 2000-11-07 Jeffrey Stedfast <fejj@helixcode.com> * mail-search-dialogue.c (mail_search_dialogue_construct): Allow diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index b6a9f9bcea..6581463c88 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -366,13 +366,13 @@ create_msg_composer (const char *url) if (id) sig_file = id->sig; - if (url != NULL) + if (url != NULL) { composer = e_msg_composer_new_from_url (url); - else - composer = e_msg_composer_new_with_sig_file (sig_file); - if (composer) - e_msg_composer_set_send_html (composer, send_html); - + if (composer) + e_msg_composer_set_send_html (composer, send_html); + } else + composer = e_msg_composer_new_with_sig_file (sig_file, send_html); + return (GtkWidget *)composer; } diff --git a/mail/mail-format.c b/mail/mail-format.c index e1109a09c1..3a747b199f 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1657,7 +1657,7 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) if (id) sig_file = id->sig; - composer = e_msg_composer_new_with_sig_file (sig_file); + composer = e_msg_composer_new_with_sig_file (sig_file, mail_config_send_html ()); if (!composer) return NULL; |