diff options
| author | Radek Doulik <rodo@ximian.com> | 2002-02-08 04:30:29 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2002-02-08 04:30:29 +0800 |
| commit | ee74c2347274dd4f8f5e7ad687deb0a24eab5f7f (patch) | |
| tree | 3a158bd0731d54a88583b297c8a159a222da096b | |
| parent | ce46cd2607c1eb758872f1b2c0d2d62290927f67 (diff) | |
| download | gsoc2013-evolution-ee74c2347274dd4f8f5e7ad687deb0a24eab5f7f.tar.gz gsoc2013-evolution-ee74c2347274dd4f8f5e7ad687deb0a24eab5f7f.tar.zst gsoc2013-evolution-ee74c2347274dd4f8f5e7ad687deb0a24eab5f7f.zip | |
call set_body later to allow ignored words to be sent to gtkhtml control
2002-02-07 Radek Doulik <rodo@ximian.com>
* mail-callbacks.c (mail_generate_reply): call set_body later to
allow ignored words to be sent to gtkhtml control ahead
svn path=/trunk/; revision=15598
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 44 |
2 files changed, 27 insertions, 22 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4c2926fb1a..771a3628b5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-02-07 Radek Doulik <rodo@ximian.com> + + * mail-callbacks.c (mail_generate_reply): call set_body later to + allow ignored words to be sent to gtkhtml control ahead + 2002-02-07 JP Rosevear <jpr@ximian.com> * component-factory.c (create_component): remove "New" from user diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 6bc8c5df53..f2b7dd5064 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -875,28 +875,6 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char return NULL; e_msg_composer_add_message_attachments (composer, message, TRUE); - - if ((mode & REPLY_NO_QUOTE) == 0) { - sender = camel_mime_message_get_from (message); - if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) { - camel_internet_address_get (sender, 0, &name, &address); - } else { - name = _("an unknown sender"); - } - - date = camel_mime_message_get_date (message, NULL); - strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), - localtime (&date)); - format = e_utf8_from_locale_string (date_str); - text = mail_tool_quote_message (message, format, name && *name ? name : address); - mail_ignore (composer, name, address); - g_free (format); - - if (text) { - e_msg_composer_set_body_text (composer, text); - g_free (text); - } - } /* Set the recipients */ accounts = mail_config_get_accounts (); @@ -982,6 +960,28 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char g_hash_table_destroy (rcpt_hash); } + /* set body text here as we want all ignored words to take effect */ + if ((mode & REPLY_NO_QUOTE) == 0) { + sender = camel_mime_message_get_from (message); + if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) { + camel_internet_address_get (sender, 0, &name, &address); + } else { + name = _("an unknown sender"); + } + + date = camel_mime_message_get_date (message, NULL); + strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), + localtime (&date)); + format = e_utf8_from_locale_string (date_str); + text = mail_tool_quote_message (message, format, name && *name ? name : address); + mail_ignore (composer, name, address); + g_free (format); + if (text) { + e_msg_composer_set_body_text (composer, text); + g_free (text); + } + } + if (me == NULL) { /* as a last resort, set the replying account (aka me) to the account this was fetched from */ |