diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-28 17:38:03 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-28 17:38:03 +0800 |
| commit | b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89 (patch) | |
| tree | 7190b4353c533028b4a0c27d241d96e883a280ad /modules/mail/em-account-prefs.c | |
| parent | 9744056c5e69227abdcdd55c4bffb674b29bd765 (diff) | |
| parent | 8f5493140c4da6e81e2c14e77833bfbb56c619f8 (diff) | |
| download | gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.gz gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.bz2 gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.lz gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.xz gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.zst gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'modules/mail/em-account-prefs.c')
| -rw-r--r-- | modules/mail/em-account-prefs.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index f4a0a740d5..4bd6c1c968 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -108,7 +108,8 @@ account_prefs_enable_account_cb (EAccountTreeView *tree_view, g_return_if_fail (account != NULL); - e_mail_store_add_by_account (prefs->priv->backend, account); + session = e_mail_backend_get_session (prefs->priv->backend); + e_mail_store_add_by_account (session, account); } static void @@ -118,6 +119,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, EAccountList *account_list; EMailSession *session; EAccount *account; + EMailSession *session; gpointer parent; gint response; @@ -129,11 +131,13 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, g_return_if_fail (account != NULL); + session = e_mail_backend_get_session (prefs->priv->backend); + account_list = e_account_tree_view_get_account_list (tree_view); g_return_if_fail (account_list != NULL); if (!e_account_list_account_has_proxies (account_list, account)) { - e_mail_store_remove_by_account (prefs->priv->backend, account); + e_mail_store_remove_by_account (session, account); return; } @@ -150,7 +154,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, e_account_list_remove_account_proxies (account_list, account); - e_mail_store_remove_by_account (prefs->priv->backend, account); + e_mail_store_remove_by_account (session, account); } static void @@ -324,11 +328,13 @@ account_prefs_delete_account (EAccountManager *manager) EAccountList *account_list; EMailSession *session; EAccount *account; + EMailSession *session; gboolean has_proxies; gpointer parent; 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); @@ -357,7 +363,7 @@ account_prefs_delete_account (EAccountManager *manager) /* Remove the account from the folder tree. */ if (account->enabled) - e_mail_store_remove_by_account (priv->backend, account); + e_mail_store_remove_by_account (session, account); /* Remove all the proxies the account has created. */ if (has_proxies) |