[evolution] Bug 791346 - ‘Disposition-Notification-To’ header doesn’t take into account the ‘From Overri
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 791346 - ‘Disposition-Notification-To’ header doesn’t take into account the ‘From Overri
- Date: Wed, 3 Jan 2018 17:26:16 +0000 (UTC)
commit 3a768e46f4c068ac0b271fc4e9c995bf160d4e08
Author: Milan Crha <mcrha redhat com>
Date: Wed Jan 3 18:26:22 2018 +0100
Bug 791346 - ‘Disposition-Notification-To’ header doesn’t take into account the ‘From Override’ field’s
value
src/composer/e-msg-composer.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
index dbadf7a..d96b6c8 100644
--- a/src/composer/e-msg-composer.c
+++ b/src/composer/e-msg-composer.c
@@ -36,6 +36,7 @@
#include <enchant/enchant.h>
#include "e-composer-from-header.h"
+#include "e-composer-text-header.h"
#include "e-composer-private.h"
#include <em-format/e-mail-part.h>
@@ -1198,9 +1199,19 @@ composer_build_message (EMsgComposer *composer,
/* Disposition-Notification-To */
if (flags & COMPOSER_FLAG_REQUEST_READ_RECEIPT) {
+ EComposerHeader *header;
const gchar *mdn_address;
- mdn_address = e_source_mail_identity_get_reply_to (mi);
+ header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_REPLY_TO);
+ mdn_address = e_composer_text_header_get_text (E_COMPOSER_TEXT_HEADER (header));
+
+ if (!mdn_address || !*mdn_address) {
+ header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_FROM);
+ mdn_address = e_composer_from_header_get_address (E_COMPOSER_FROM_HEADER
(header));
+ }
+
+ if (!mdn_address || !*mdn_address)
+ mdn_address = e_source_mail_identity_get_reply_to (mi);
if (mdn_address == NULL)
mdn_address = e_source_mail_identity_get_address (mi);
if (mdn_address != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]