aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer-hdrs.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 5f3c6a9d6a..a7a6e003a2 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-18 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer-hdrs.c (create_from_optionmenu): Only add the
+ account address to the list of addresses if it is non-NULL. Fixes
+ bug #32446 although it shouldn't ever happen anyway (an account
+ address is not allowed to be NULL).
+
2002-10-16 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment.c (e_msg_composer_attachment_new): We
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 7e09eb64f4..46bcbd1f46 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -209,7 +209,8 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs)
accounts = mail_config_get_accounts ();
for (a = accounts; a; a = a->next) {
account = a->data;
- g_ptr_array_add (addresses, account->id->address);
+ if (account->id->address)
+ g_ptr_array_add (addresses, account->id->address);
}
while (accounts) {