aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2007-04-05 16:12:44 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2007-04-05 16:12:44 +0800
commitbab13ad62c547623a2a3b9f04846f36c7e775a25 (patch)
tree0721bf37f631e5b86c99395716e75f48eb816de8
parenta5b5308e97368433ad9c802a8785a54d35d32fe1 (diff)
downloadgsoc2013-evolution-bab13ad62c547623a2a3b9f04846f36c7e775a25.tar.gz
gsoc2013-evolution-bab13ad62c547623a2a3b9f04846f36c7e775a25.tar.zst
gsoc2013-evolution-bab13ad62c547623a2a3b9f04846f36c7e775a25.zip
Patch committed on behalf of Paul Iadonisi <pri.gnome-bz@iadonisi.to>
2007-04-05 Sankar P <psankar@novell.com> * Patch committed on behalf of Paul Iadonisi <pri.gnome-bz@iadonisi.to> * e-msg-composer-hdrs.c: (create_from_optionmenu): Show only enabled accounts on composer. Look at bug #243241 svn path=/trunk/; revision=33384
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-msg-composer-hdrs.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index c26c392b03..c835c61927 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-05 Sankar P <psankar@novell.com>
+
+ * Patch committed on behalf of Paul Iadonisi <pri.gnome-bz@iadonisi.to>
+
+ * e-msg-composer-hdrs.c: (create_from_optionmenu):
+ Show only enabled accounts on composer.
+ Look at bug #243241
+
2007-03-29 Matthew Barnes <mbarnes@redhat.com>
* e-msg-composer-select-file.c:
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index e4d4b046fd..2a1ae8d774 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -384,7 +384,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->id->address && account_can_send (account) && account->enabled)
g_ptr_array_add (addresses, account->id->address);
e_iterator_next (iter);
@@ -402,8 +402,8 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs)
g_assert_not_reached ();
continue;
}
-
- if (account->id->address && *account->id->address && account_can_send (account)) {
+
+ if (account->id->address && *account->id->address && account_can_send (account) && account->enabled) {
/* If the account has a unique email address, just
* show that. Otherwise include the account name.
*/