From 49bad5e10fbf9a6f084d53ff1076df4f10aff049 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 24 Jul 2001 20:12:47 +0000 Subject: Do a case-insensitive comparison. (mail_generate_reply): Only resort to 2001-07-24 Jeffrey Stedfast * mail-callbacks.c (guess_me): Do a case-insensitive comparison. (mail_generate_reply): Only resort to the source account's identity if we can't find out which identity to use based on the recipients of the message first. * mail-config.c (mail_config_get_default_account): Make sure to return the 0th account if we don't have a default. We don't want to return NULL. * mail-callbacks.c (empty_trash): Use mail_tool_get_trash for the remote store trash folders. * mail-tools.c (mail_tool_get_trash): New convenience function. svn path=/trunk/; revision=11353 --- mail/mail-config.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'mail/mail-config.c') diff --git a/mail/mail-config.c b/mail/mail-config.c index ada42089ec..080b8e46e0 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -1266,21 +1266,21 @@ mail_config_set_default_charset (const char *charset) const MailConfigAccount * mail_config_get_default_account (void) { - const MailConfigAccount *account; - GSList *l; MailConfigAccount *retval; if (!config->accounts) return NULL; - + retval = g_slist_nth_data (config->accounts, config->default_account); - + /* Looks like we have no default, so make the first account the default */ - if (retval == NULL) + if (retval == NULL) { mail_config_set_default_account_num (0); - + retval = config->accounts->data; + } + return retval; } @@ -1367,13 +1367,12 @@ mail_config_set_default_account_num (gint new_default) void mail_config_set_default_account (const MailConfigAccount *account) { - GSList *node = config->accounts; - gint position = 0; - + int position; + position = g_slist_index (config->accounts, (void*)account); - + config->default_account = position; - + return; } -- cgit