diff options
Diffstat (limited to 'modules/mail/em-account-prefs.c')
| -rw-r--r-- | modules/mail/em-account-prefs.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 1b11b41b68..f4a0a740d5 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -62,7 +62,9 @@ G_DEFINE_TYPE ( E_TYPE_ACCOUNT_MANAGER) static gboolean -account_prefs_toggle_enable_special (EMAccountPrefs *prefs, EAccountTreeViewSelectedType type, gboolean enabled) +account_prefs_toggle_enable_special (EMAccountPrefs *prefs, + EAccountTreeViewSelectedType type, + gboolean enabled) { const gchar *prop = NULL; EShell *shell; @@ -106,8 +108,7 @@ account_prefs_enable_account_cb (EAccountTreeView *tree_view, g_return_if_fail (account != NULL); - session = e_mail_backend_get_session (prefs->priv->backend); - e_mail_store_add_by_account (session, account); + e_mail_store_add_by_account (prefs->priv->backend, account); } static void @@ -131,10 +132,8 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, account_list = e_account_tree_view_get_account_list (tree_view); g_return_if_fail (account_list != NULL); - session = e_mail_backend_get_session (prefs->priv->backend); - if (!e_account_list_account_has_proxies (account_list, account)) { - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (prefs->priv->backend, account); return; } @@ -151,7 +150,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, e_account_list_remove_account_proxies (account_list, account); - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (prefs->priv->backend, account); } static void @@ -330,7 +329,6 @@ account_prefs_delete_account (EAccountManager *manager) gint response; priv = EM_ACCOUNT_PREFS (manager)->priv; - session = e_mail_backend_get_session (priv->backend); account_list = e_account_manager_get_account_list (manager); tree_view = e_account_manager_get_tree_view (manager); @@ -359,7 +357,7 @@ account_prefs_delete_account (EAccountManager *manager) /* Remove the account from the folder tree. */ if (account->enabled) - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (priv->backend, account); /* Remove all the proxies the account has created. */ if (has_proxies) @@ -423,7 +421,8 @@ em_account_prefs_init (EMAccountPrefs *prefs) } static void -account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view, EMailBackend *backend) +account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view, + EMailBackend *backend) { GSList *account_uids; |