mailer fix for bug #324327
Jeffrey Stedfast <[email protected]>
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Organization | Novell, Inc. |
| Message-ID | <[email protected]> |
http://bugzilla.gnome.org/show_bug.cgi?id=324327 Simple fix, should go into both gnome-2-14 and HEAD -- Jeffrey Stedfast Evolution Hacker - Novell, Inc. [email protected] - www.novell.com _______________________________________________ Evolution-patches mailing list [email protected] http://mail.gnome.org/mailman/listinfo/evolution-patches
324327.patch
(text/x-patch, 1.8 KB)
? 324327.patch ? changelog-fix.patch ? mail.error ? default/fr/Makefile ? default/fr/Makefile.in ? default/lt/Makefile ? default/lt/Makefile.in Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution/mail/ChangeLog,v retrieving revision 1.3818.2.6 diff -u -r1.3818.2.6 ChangeLog --- ChangeLog 14 Apr 2006 18:02:24 -0000 1.3818.2.6 +++ ChangeLog 14 Apr 2006 18:04:00 -0000 @@ -1,3 +1,9 @@ +2006-04-14 Jeffrey Stedfast <[email protected]> + + * 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 <[email protected]> ** Fixes 333243 Index: em-composer-utils.c =================================================================== RCS file: /cvs/gnome/evolution/mail/em-composer-utils.c,v retrieving revision 1.53 diff -u -r1.53 em-composer-utils.c --- em-composer-utils.c 1 Mar 2006 07:42:39 -0000 1.53 +++ em-composer-utils.c 14 Apr 2006 18:04:00 -0000 @@ -1121,7 +1121,7 @@ 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 @@ 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); }