callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call set_body later to allow ignored words to be sent to gtkhtml control

Browse Source 
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
This commit is contained in:
Radek Doulik
2002-02-07 20:30:29 +00:00
committed by Radek Doulik
parent ce46cd2607
commit ee74c23472
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/ChangeLog
View File

@ -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

44
mail/mail-callbacks.c
View File

@ -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 */