aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-composer-utils.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e7400fdd1d..0b6eae3641 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ * em-composer-utils.c: (em_utils_handle_receipt):
+ check if account is null before accessing it
+
2006-01-30 Harish Krishnaswamy <kharish@novell.com>
* mail-config.glade: s/T_erminal/Fi_xed width/ for consistency with other
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index fe404a0d20..88269a4ccc 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1131,7 +1131,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage
addr++;
}
- if (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS
+ 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);