diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-01-08 03:56:23 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-01-08 03:56:23 +0800 |
| commit | 08fe7bd670db7de9937f924a4466a64d6e401e95 (patch) | |
| tree | ef41e290b77c6c11dc87e735a0b9759196d7ed48 | |
| parent | 9dfd6e5d0cb1ad0255ac9d32c27e48397bbe5af9 (diff) | |
| download | gsoc2013-evolution-08fe7bd670db7de9937f924a4466a64d6e401e95.tar.gz gsoc2013-evolution-08fe7bd670db7de9937f924a4466a64d6e401e95.tar.zst gsoc2013-evolution-08fe7bd670db7de9937f924a4466a64d6e401e95.zip | |
Set the X-Evolution-Format header to text/plain if that is the editing
2002-01-07 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (e_msg_composer_get_message_draft): Set the
X-Evolution-Format header to text/plain if that is the editing
mode we are really in. This fixes bug #11499.
svn path=/trunk/; revision=15255
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 1 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index dc58ee9610..cdbf338f25 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2002-01-07 Jeffrey Stedfast <fejj@ximian.com> + + * e-msg-composer.c (e_msg_composer_get_message_draft): Set the + X-Evolution-Format header to text/plain if that is the editing + mode we are really in. This fixes bug #11499. + 2002-01-04 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (e_msg_composer_new_from_url): A few minor diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 3445abe508..85f85000fa 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -202,7 +202,6 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs) } if (account->id->address && *account->id->address) { - if (strcmp (account->name, account->id->address)) label = g_strdup_printf ("%s <%s> (%s)", account->id->name, account->id->address, account->name); diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index ee61dd1357..5c8cb768d3 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1229,6 +1229,7 @@ autosave_init_file (EMsgComposer *composer) } return FALSE; } + static void autosave_manager_start (AutosaveManager *am) { @@ -3336,6 +3337,11 @@ e_msg_composer_get_message_draft (EMsgComposer *composer) if (account && account->name) camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Account", account->name); + /* build_message() set this to text/html since we set composer->send_html to + TRUE before calling e_msg_composer_get_message() */ + if (!composer->send_html) + camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Format", "text/plain"); + return msg; } |