aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-composer-utils.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2006-04-19 04:56:36 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2006-04-19 04:56:36 +0800
commita82d466e9354e39be0324728f719af1990f09e6e (patch)
tree22f4d43df1b80282e137acb3b7ef3feb62788815 /mail/em-composer-utils.c
parentab7c700749f00c81fb6ceb56ec2ea2f79be1734a (diff)
downloadgsoc2013-evolution-a82d466e9354e39be0324728f719af1990f09e6e.tar.gz
gsoc2013-evolution-a82d466e9354e39be0324728f719af1990f09e6e.tar.zst
gsoc2013-evolution-a82d466e9354e39be0324728f719af1990f09e6e.zip
Removed error id "camel-exception" as it was a bogus error.
2006-04-18 Jeffrey Stedfast <fejj@novell.com> * mail.error.xml: Removed error id "camel-exception" as it was a bogus error. 2006-04-14 Jeffrey Stedfast <fejj@novell.com> * 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
Diffstat (limited to 'mail/em-composer-utils.c')
-rw-r--r--mail/em-composer-utils.c7
1 files changed, 3 insertions, 4 deletions
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);
}