aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-composer-utils.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-10-16 03:02:42 +0800
committerMilan Crha <mcrha@redhat.com>2009-10-16 03:02:42 +0800
commitf74a1448947259f52293ba922b64b2b3b8ff726c (patch)
treea85e893277db5a7564ba2857f87b8f256227f06d /mail/em-composer-utils.c
parent3766e19a2aafccaae1f662bc8770f074fdcc4a2d (diff)
downloadgsoc2013-evolution-f74a1448947259f52293ba922b64b2b3b8ff726c.tar.gz
gsoc2013-evolution-f74a1448947259f52293ba922b64b2b3b8ff726c.tar.zst
gsoc2013-evolution-f74a1448947259f52293ba922b64b2b3b8ff726c.zip
Bug #322261 - vCalendar replies are sent out using the default account
Diffstat (limited to 'mail/em-composer-utils.c')
-rw-r--r--mail/em-composer-utils.c34
1 files changed, 2 insertions, 32 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 33972e1222..81055d1ab0 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1844,19 +1844,6 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
}
static EAccount *
-guess_account_folder(CamelFolder *folder)
-{
- EAccount *account;
- gchar *tmp;
-
- tmp = camel_url_to_string(CAMEL_SERVICE(folder->parent_store)->url, CAMEL_URL_HIDE_ALL);
- account = mail_config_get_account_by_source_url(tmp);
- g_free(tmp);
-
- return account;
-}
-
-static EAccount *
guess_account (CamelMimeMessage *message, CamelFolder *folder)
{
GHashTable *account_hash = NULL;
@@ -1868,27 +1855,10 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder)
CAMEL_RECIPIENT_TYPE_CC
};
- /* check for newsgroup header */
- if (folder
- && camel_medium_get_header((CamelMedium *)message, "Newsgroups")
- && (account = guess_account_folder(folder)))
+ account = em_utils_guess_account (message, folder);
+ if (account)
return account;
- /* check for source folder */
- if (folder) {
- account = guess_account_folder(folder);
- if (account)
- return account;
- }
-
- /* then message source */
- if (account == NULL
- && (tmp = camel_mime_message_get_source(message))) {
- account = mail_config_get_account_by_source_url(tmp);
- if (account)
- return account;
- }
-
/* finally recipient (to/cc) in account table */
account_hash = generate_account_hash ();
for (j=0;account == NULL && j<2;j++) {