From 0be9b1f878c2f54a0c7f2f5024125813022d81b1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 Apr 2011 19:06:35 -0400 Subject: Adapt to CamelService changes. --- modules/mail/em-account-prefs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'modules/mail/em-account-prefs.c') diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 79d64eaf3e..356351a2f1 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -67,8 +67,7 @@ account_prefs_enable_account_cb (EAccountTreeView *tree_view, account = e_account_tree_view_get_selected (tree_view); g_return_if_fail (account != NULL); - e_mail_store_add_by_uri ( - prefs->priv->session, account->source->url, account->name); + e_mail_store_add_by_account (prefs->priv->session, account); } static void @@ -87,7 +86,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, g_return_if_fail (account_list != NULL); if (!e_account_list_account_has_proxies (account_list, account)) { - e_mail_store_remove_by_uri (prefs->priv->session, account->source->url); + e_mail_store_remove_by_account (prefs->priv->session, account); return; } @@ -104,8 +103,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, e_account_list_remove_account_proxies (account_list, account); - e_mail_store_remove_by_uri ( - prefs->priv->session, account->source->url); + e_mail_store_remove_by_account (prefs->priv->session, account); } static void @@ -310,9 +308,8 @@ account_prefs_delete_account (EAccountManager *manager) } /* Remove the account from the folder tree. */ - if (account->enabled && account->source && account->source->url) - e_mail_store_remove_by_uri ( - priv->session, account->source->url); + if (account->enabled) + e_mail_store_remove_by_account (priv->session, account); /* Remove all the proxies the account has created. */ if (has_proxies) -- cgit