aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 41ffe07771..5b06e15d96 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-25 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-callbacks.c (composer_postpone_cb): Abort if the message is
+ NULL (which is valid if an error occured).
+ (composer_send_cb): Same.
+
2001-02-24 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser.c: Toss the mail_tool_camel_lock* stuff.
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 4afabc13c0..ca4a484ef3 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -301,6 +301,8 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
/* Get the message */
message = e_msg_composer_get_message (composer);
+ if (message == NULL)
+ return;
/* Check for no recipients */
iaddr = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
@@ -347,6 +349,8 @@ composer_postpone_cb (EMsgComposer *composer, gpointer data)
/* Get the message */
message = e_msg_composer_get_message (composer);
+ if (message == NULL)
+ return;
/* Check for no subject */
subject = camel_mime_message_get_subject (message);