aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3dc30678fb..4a14acfeaa 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-06 Larry Ewing <lewing@ximian.com>
+
+ * mail-callbacks.c (composer_send_cb): add a NULL check since that
+ is a valid return.
+
2001-07-06 Peter Williams <peterw@ximian.com>
* mail-format.c (format_mime_part): Prevent infinite recursion when
@@ -31,6 +36,7 @@
2001-07-06 Peter Williams <peterw@ximian.com>
+>>>>>>> 1.1360
* mail-callbacks.c (composer_postpone_cb): Don't free the psd here --
it will be freed on the "destroy" signal.
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 989698bfac..33b7c2ee30 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -417,8 +417,11 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
message = composer_get_message (composer);
if (!message)
return;
+
transport = mail_config_get_default_transport ();
-
+ if (!transport)
+ return;
+
send = g_malloc (sizeof (*send));
send->psd = psd;
send->composer = composer;