From 05601e86ebfc36093c8b2afb66cbe14cb45d6bd2 Mon Sep 17 00:00:00 2001 From: Parthasarathi Susarla Date: Sat, 22 Oct 2005 08:18:50 +0000 Subject: Return valid transport, only if the account is enabled. 2005-10-22 Parthasarathi Susarla * mail-config.c: (mail_config_get_default_account): Return valid transport, only if the account is enabled. 2005-10-22 Parthasarathi Susarla * em-composer-utils.c: (create_new_composer): If the account corresponding to the fromuri is not enabled. Then load the preferred account from the composer. ---------------------------------------------------------------------- svn path=/trunk/; revision=30555 --- mail/mail-config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-config.c') diff --git a/mail/mail-config.c b/mail/mail-config.c index 7d3a876a47..6619b49b84 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -741,7 +741,7 @@ mail_config_get_default_transport (void) EIterator *iter; account = mail_config_get_default_account (); - if (account && account->transport && account->transport->url && account->transport->url[0]) + if (account && account->enabled && account->transport && account->transport->url && account->transport->url[0]) return account->transport; /* return the first account with a transport? */ @@ -749,7 +749,7 @@ mail_config_get_default_transport (void) while (e_iterator_is_valid (iter)) { account = (EAccount *) e_iterator_get (iter); - if (account->transport && account->transport->url && account->transport->url[0]) { + if (account->enabled && account->transport && account->transport->url && account->transport->url[0]) { g_object_unref (iter); return account->transport; -- cgit