diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-09-05 22:43:58 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-09-05 22:43:58 +0800 |
| commit | e18f1b87095c60977c4c0e0a279e7ee78a049dc6 (patch) | |
| tree | e3f16f2372966ae6081c3159f0caf8cd8835fda6 /composer/e-msg-composer.c | |
| parent | 511acab89a83114aad35e9c6f76a8f284907dab9 (diff) | |
| download | gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar.gz gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar.bz2 gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar.lz gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar.xz gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.tar.zst gsoc2013-evolution-e18f1b87095c60977c4c0e0a279e7ee78a049dc6.zip | |
Composer could start with empty From
Diffstat (limited to 'composer/e-msg-composer.c')
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 0fc5f2f475..777b7e7423 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -575,8 +575,8 @@ build_message_headers (EMsgComposer *composer, camel_mime_message_set_from (message, addr); g_object_unref (addr); - /* X-Evolution-Account */ - header_name = "X-Evolution-Account"; + /* X-Evolution-Identity */ + header_name = "X-Evolution-Identity"; camel_medium_set_header (medium, header_name, uid); /* X-Evolution-Fcc */ @@ -3108,6 +3108,11 @@ e_msg_composer_new_with_message (EShell *shell, /* Restore the mail identity preference. */ identity_uid = (gchar *) camel_medium_get_header ( CAMEL_MEDIUM (message), "X-Evolution-Identity"); + if (!identity_uid) { + /* for backward compatibility */ + identity_uid = (gchar *) camel_medium_get_header ( + CAMEL_MEDIUM (message), "X-Evolution-Account"); + } if (identity_uid != NULL) { identity_uid = g_strstrip (g_strdup (identity_uid)); source = e_source_registry_ref_source (registry, identity_uid); |