diff options
| author | Parthasarathi Susarla <sparthasarathi@novell.com> | 2005-10-05 16:07:12 +0800 |
|---|---|---|
| committer | Parthasarathi Susarla <saps@src.gnome.org> | 2005-10-05 16:07:12 +0800 |
| commit | e37cfb0e8246ad7dadf4ddf051ee95023eb4ff59 (patch) | |
| tree | a2277f1295430438a271ca7e47849594ffcca157 /composer | |
| parent | b0bbe73658c3083bfcdcca93831a88972b620f2c (diff) | |
| download | gsoc2013-evolution-e37cfb0e8246ad7dadf4ddf051ee95023eb4ff59.tar.gz gsoc2013-evolution-e37cfb0e8246ad7dadf4ddf051ee95023eb4ff59.tar.zst gsoc2013-evolution-e37cfb0e8246ad7dadf4ddf051ee95023eb4ff59.zip | |
** See bug #315987
2005-10-05 Parthasarathi Susarla <sparthasarathi@novell.com>
** 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
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 <sparthasarathi@novell.com> + + ** 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 <sragavan@novell.com> ** 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. */ |