diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-01-05 22:08:10 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-01-05 22:08:10 +0800 |
commit | 88505f694e57aa016359aa994e202f62da8b5142 (patch) | |
tree | d7370407cce0888a530339baf878c0015d81750e /mail/em-utils.c | |
parent | ea4c16fdadd48c89bfedf04972b10674e70fcca9 (diff) | |
download | gsoc2013-evolution-88505f694e57aa016359aa994e202f62da8b5142.tar.gz gsoc2013-evolution-88505f694e57aa016359aa994e202f62da8b5142.tar.zst gsoc2013-evolution-88505f694e57aa016359aa994e202f62da8b5142.zip |
Make em_utils_generate_account_hash() private.
Only used by em_utils_get_reply_all(), and the hash table it returns is
not safe for general-purpose use. Make it a static function and rename
it generate_recipient_hash().
Diffstat (limited to 'mail/em-utils.c')
-rw-r--r-- | mail/em-utils.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index ac8a4369c4..416588cfbb 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2102,64 +2102,6 @@ guess_account_from_message (CamelMimeMessage *message) return (uid != NULL) ? e_get_account_by_uid (uid) : NULL; } -GHashTable * -em_utils_generate_account_hash (void) -{ - GHashTable *account_hash; - EAccount *account, *def; - EAccountList *account_list; - EIterator *iterator; - - account_list = e_get_account_list (); - account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal); - - def = e_get_default_account (); - - iterator = e_list_get_iterator (E_LIST (account_list)); - - while (e_iterator_is_valid (iterator)) { - account = (EAccount *) e_iterator_get (iterator); - - if (account->id->address) { - EAccount *acnt; - - /* Accounts with identical email addresses that are - * enabled take precedence over the accounts that - * aren't. If all accounts with matching email - * addresses are disabled, then the first one in - * the list takes precedence. The default account - * always takes precedence no matter what. */ - acnt = g_hash_table_lookup ( - account_hash, account->id->address); - if (acnt && acnt != def && !acnt->enabled && account->enabled) { - g_hash_table_remove ( - account_hash, acnt->id->address); - acnt = NULL; - } - - if (!acnt) - g_hash_table_insert ( - account_hash, (gchar *) - account->id->address, - (gpointer) account); - } - - e_iterator_next (iterator); - } - - g_object_unref (iterator); - - /* The default account has to be there if none - * of the enabled accounts are present. */ - if (g_hash_table_size (account_hash) == 0 && def && def->id->address) - g_hash_table_insert ( - account_hash, (gchar *) - def->id->address, - (gpointer) def); - - return account_hash; -} - EAccount * em_utils_guess_account (CamelMimeMessage *message, CamelFolder *folder) |