From e37cfb0e8246ad7dadf4ddf051ee95023eb4ff59 Mon Sep 17 00:00:00 2001 From: Parthasarathi Susarla Date: Wed, 5 Oct 2005 08:07:12 +0000 Subject: ** See bug #315987 2005-10-05 Parthasarathi Susarla ** See bug #315987 * e-msg-composer-hdrs.c: (create_from_optionmenu): Load the account info in the From header only if the account is enabled svn path=/trunk/; revision=30490 --- composer/ChangeLog | 8 ++++++++ composer/e-msg-composer-hdrs.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index b349327407..93f270f39d 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,11 @@ +2005-10-05 Parthasarathi Susarla + + ** See bug #315987 + + * e-msg-composer-hdrs.c: (create_from_optionmenu): + Load the account info in the From header only if the + account is enabled + 2005-10-04 Srinivasa Ragavan ** fixes bug #316937 diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 34f8b91f8a..4e9cc74988 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -372,7 +372,7 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs) while (e_iterator_is_valid (iter)) { account = (EAccount *) e_iterator_get (iter); - if (account->id->address && account_can_send (account)) + if (account->enabled && account->id->address && account_can_send (account)) g_ptr_array_add (addresses, account->id->address); e_iterator_next (iter); @@ -391,7 +391,7 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs) continue; } - if (account->id->address && *account->id->address && account_can_send (account)) { + if (account->enabled && account->id->address && *account->id->address && account_can_send (account)) { /* If the account has a unique email address, just * show that. Otherwise include the account name. */ -- cgit v1.2.3