Move more account utilities to e-account-utils.c.

7 files changed, 3 insertions, 8 deletions

diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 31f60834e5..b28b02eee0 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -33,7 +33,6 @@
 #include "widgets/misc/e-search-bar.h"
 
 #include "em-utils.h"
-#include "mail-config.h"
 #include "mail-ops.h"
 #include "message-list.h"
 
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 7548b5e54a..74af7904da 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -72,7 +72,7 @@ action_mail_account_disable_cb (GtkAction *action,
 	g_return_if_fail (folder_uri != NULL);
 
 	account_list = e_get_account_list ();
-	account = mail_config_get_account_by_source_url (folder_uri);
+	account = e_get_account_by_source_url (folder_uri);
 	g_return_if_fail (account != NULL);
 
 	if (e_account_list_account_has_proxies (account_list, account))
@@ -1066,7 +1066,7 @@ action_mail_tools_subscriptions_cb (GtkAction *action,
 
 	uri = em_folder_tree_get_selected_uri (folder_tree);
 	if (uri != NULL) {
-		account = mail_config_get_account_by_source_url (uri);
+		account = e_get_account_by_source_url (uri);
 		g_free (uri);
 	}
 
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index bb56a9e27e..92f00d4eb9 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -53,7 +53,6 @@
 #include "em-subscription-editor.h"
 #include "em-utils.h"
 #include "mail-autofilter.h"
-#include "mail-config.h"
 #include "mail-ops.h"
 #include "mail-send-recv.h"
 #include "mail-tools.h"
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index cdfdd59c5c..557d206c36 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -910,7 +910,7 @@ mail_shell_view_update_actions (EShellView *shell_view)
 		folder_tree_and_message_list_agree =
 			(g_strcmp0 (uri, folder_uri) == 0);
 
-		account = mail_config_get_account_by_source_url (uri);
+		account = e_get_account_by_source_url (uri);
 
 		/* FIXME This belongs in a GroupWise plugin. */
 		account_is_groupwise =
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 2ae67cb955..843cfff5e6 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -50,7 +50,6 @@
 #include "widgets/misc/e-signature-manager.h"
 #include "widgets/misc/e-signature-preview.h"
 
-#include "mail-config.h"
 #include "em-config.h"
 #include "em-folder-selection-button.h"
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index f0f8e42a35..522138a134 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -46,7 +46,6 @@
 #include "e-mail-backend.h"
 #include "e-mail-label-manager.h"
 #include "e-mail-reader-utils.h"
-#include "mail-config.h"
 #include "em-folder-selection-button.h"
 #include "em-junk.h"
 #include "em-config.h"
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 9d4ff9618e..f216d81c28 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -40,7 +40,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 
-#include "mail-config.h"
 #include "em-config.h"
 #include "em-folder-selection-button.h"