diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-tools.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 178ca7eb3f..6f8565b8fc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2002-04-29 Larry Ewing <lewing@ximian.com> + * mail-tools.c (mail_tool_quote_message): use the html reply logic + even for plain parts so that we can test out the new gtkhtml cite logic. + * importers/evolution-mbox-importer.c (process_item_fn): add const to silence warning. @@ -28,7 +31,6 @@ * mail-account-gui.c (mail_account_gui_auto_detect_extra_conf): New function to auto-detect the extra config options for a source. ->>>>>>> 1.2146 2002-04-24 Jeffrey Stedfast <fejj@ximian.com> * mail-account-gui.c (mail_account_gui_build_extra_conf): Allow diff --git a/mail/mail-tools.c b/mail/mail-tools.c index cf9dd484da..ba1de929dd 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -340,11 +340,15 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...) gboolean want_plain; gchar *text; - want_plain = !mail_config_get_send_html (); contents = camel_medium_get_content_object (CAMEL_MEDIUM (message)); /* We pass "want_plain" for "cite", since if it's HTML, we'll * do the citing ourself below. */ + /* FIXME the citing logic has changed and we basically never want_plain + * to be true now, but I don't want to remove all that logic until I + * am sure --Larry + */ + want_plain = FALSE; text = mail_get_message_body (contents, want_plain, want_plain); /* Set the quoted reply text. */ |