1 files changed, 12 insertions, 12 deletions

diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index a5c5d59fd8..72e8881863 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -70,7 +70,7 @@
 #include "mail-ops.h"
 #include "mail-mt.h"
 
-#include "e-mail-shell-module.h"
+#include "e-mail-shell-backend.h"
 
 #if defined (HAVE_NSS)
 #include "smime/gui/e-cert-selector.h"
@@ -449,13 +449,13 @@ default_folders_clicked (GtkButton *button, gpointer user_data)
 	EMAccountEditor *emae = user_data;
 	const char *uri;
 
-	uri = e_mail_shell_module_get_folder_uri (
-		mail_shell_module, E_MAIL_FOLDER_DRAFTS);
+	uri = e_mail_shell_backend_get_folder_uri (
+		global_mail_shell_backend, E_MAIL_FOLDER_DRAFTS);
 	em_folder_selection_button_set_selection((EMFolderSelectionButton *)emae->priv->drafts_folder_button, uri);
 	emae_account_folder_changed((EMFolderSelectionButton *)emae->priv->drafts_folder_button, emae);
 
-	uri = e_mail_shell_module_get_folder_uri (
-		mail_shell_module, E_MAIL_FOLDER_SENT);
+	uri = e_mail_shell_backend_get_folder_uri (
+		global_mail_shell_backend, E_MAIL_FOLDER_SENT);
 	em_folder_selection_button_set_selection((EMFolderSelectionButton *)emae->priv->sent_folder_button, uri);
 	emae_account_folder_changed((EMFolderSelectionButton *)emae->priv->sent_folder_button, emae);
 }
@@ -468,7 +468,7 @@ em_account_editor_folder_selector_button_new (char *widget_name, char *string1,
 {
 	EMFolderTreeModel *model;
 
-	model = e_mail_shell_module_get_folder_tree_model (mail_shell_module);
+	model = e_mail_shell_backend_get_folder_tree_model (global_mail_shell_backend);
 	return (GtkWidget *)em_folder_selection_button_new(model, string1 ? string1 : _("Select Folder"), NULL);
 }
 
@@ -907,8 +907,8 @@ emae_account_folder(EMAccountEditor *emae, const char *name, int item, int deffo
 	} else {
 		const gchar *uri;
 
-		uri = e_mail_shell_module_get_folder_uri (
-			mail_shell_module, deffolder);
+		uri = e_mail_shell_backend_get_folder_uri (
+			global_mail_shell_backend, deffolder);
 		em_folder_selection_button_set_selection(folder, uri);
 	}
 
@@ -2868,13 +2868,13 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 		emae->account = e_account_new();
 		emae->account->enabled = TRUE;
 
-		uri = e_mail_shell_module_get_folder_uri (
-			mail_shell_module, E_MAIL_FOLDER_DRAFTS);
+		uri = e_mail_shell_backend_get_folder_uri (
+			global_mail_shell_backend, E_MAIL_FOLDER_DRAFTS);
 		e_account_set_string (
 			emae->account, E_ACCOUNT_DRAFTS_FOLDER_URI, uri);
 
-		uri = e_mail_shell_module_get_folder_uri (
-			mail_shell_module, E_MAIL_FOLDER_SENT);
+		uri = e_mail_shell_backend_get_folder_uri (
+			global_mail_shell_backend, E_MAIL_FOLDER_SENT);
 		e_account_set_string (
 			emae->account, E_ACCOUNT_SENT_FOLDER_URI, uri);
 	}