[evolution] Bug #605633 - A little code inconsistency in em_utils_send_receipt
- From: Milan Crha <mcrha src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Bug #605633 - A little code inconsistency in em_utils_send_receipt
- Date: Wed, 13 Jan 2010 18:35:29 +0000 (UTC)
commit 4f94ca687e562281207c3c45ff93f8c09d2c861f
Author: Milan Crha <mcrha redhat com>
Date: Wed Jan 13 19:35:02 2010 +0100
Bug #605633 - A little code inconsistency in em_utils_send_receipt
mail/em-composer-utils.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 371371a..e998c42 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1541,6 +1541,9 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
if (!receipt_address)
return;
+ /* the 'account' should be always set */
+ g_return_if_fail (account != NULL);
+
/* Collect information for the receipt */
/* We use camel_header_msgid_generate () to get a canonical
@@ -1632,14 +1635,9 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
camel_object_unref (addr);
camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>");
- if (account) {
- camel_medium_set_header (CAMEL_MEDIUM (receipt),
- "X-Evolution-Account", account->uid);
- camel_medium_set_header (CAMEL_MEDIUM (receipt),
- "X-Evolution-Transport", account->transport->url);
- camel_medium_set_header (CAMEL_MEDIUM (receipt),
- "X-Evolution-Fcc", account->sent_folder_uri);
- }
+ camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Account", account->uid);
+ camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Transport", account->transport->url);
+ camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Fcc", account->sent_folder_uri);
/* Send the receipt */
info = camel_message_info_new (NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]