From a82d466e9354e39be0324728f719af1990f09e6e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 18 Apr 2006 20:56:36 +0000 Subject: Removed error id "camel-exception" as it was a bogus error. 2006-04-18 Jeffrey Stedfast * mail.error.xml: Removed error id "camel-exception" as it was a bogus error. 2006-04-14 Jeffrey Stedfast * em-composer-utils.c (em_utils_handle_receipt): Fixed up the if conditional so that 'account' wasn't ever dereferenced when NULL. Fixes bug #324327. svn path=/trunk/; revision=31829 --- mail/em-composer-utils.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mail/em-composer-utils.c') diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 3dcf7adcba..39824109bf 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1121,7 +1121,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage return; } - if ( (addr = camel_medium_get_header((CamelMedium *)msg, "Disposition-Notification-To")) == NULL) { + if ((addr = camel_medium_get_header((CamelMedium *)msg, "Disposition-Notification-To")) == NULL) { camel_message_info_free(info); return; } @@ -1139,9 +1139,8 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage addr++; } - if (account && account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS - || (account->receipt_policy == E_ACCOUNT_RECEIPT_ASK - && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES)) + if (account && (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS || account->receipt_policy == E_ACCOUNT_RECEIPT_ASK) + && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES) em_utils_send_receipt(folder, msg); } -- cgit v1.2.3