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/ChangeLog | 11 + mail/em-composer-utils.c | 7 +- mail/mail.error.xml | 655 +++++++++++++++++++++++------------------------ 3 files changed, 338 insertions(+), 335 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 8de907cfcb..98eaa70ac2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +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. + 2006-04-10 Jeff Cai ** Fixes 333243 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); } diff --git a/mail/mail.error.xml b/mail/mail.error.xml index 59d0e13b27..0bc636486f 100644 --- a/mail/mail.error.xml +++ b/mail/mail.error.xml @@ -1,351 +1,344 @@ - - <_primary>Invalid authentication - <_secondary xml:space="preserve">This server does not support this type of authentication and may not support authentication at all. - - - - <_primary>Your login to your server "{0}" as "{0}" failed. - <_secondary xml:space="preserve">Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on. - - - - <_primary>Are you sure you want to send a message in HTML format? - <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email: + + <_primary>Invalid authentication + <_secondary xml:space="preserve">This server does not support this type of authentication and may not support authentication at all. + + + + <_primary>Your login to your server "{0}" as "{0}" failed. + <_secondary xml:space="preserve">Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on. + + + + <_primary>Are you sure you want to send a message in HTML format? + <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email: {0} Send anyway? -