aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-composer-utils.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 44dd91a430..6c47451d97 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #466548
+
+ * em-composer-utils.c: (em_utils_composer_send_cb):
+ e_msg_composer_get_preferred_account can return NULL, so test for it.
+
2007-08-13 Milan Crha <mcrha@redhat.com>
** Fix for bug #352346
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 5a6d9dbd8f..dc7c8c541a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -414,7 +414,7 @@ em_utils_composer_send_cb (EMsgComposer *composer, gpointer user_data)
EAccount *account;
account = e_msg_composer_get_preferred_account (composer);
- if (!account->enabled) {
+ if (!account || !account->enabled) {
e_error_run((GtkWindow *)composer, "mail:send-no-account-enabled", NULL);
return;
}