From ec170e47fdeb57272110fa3ef9164a98d8b69d84 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Oct 2010 10:42:48 -0400 Subject: Move more account utilities to e-account-utils.c. --- plugins/external-editor/external-editor.c | 1 - plugins/groupwise-features/install-shared.c | 4 ++-- plugins/groupwise-features/proxy-login.c | 5 ++--- plugins/groupwise-features/share-folder-common.c | 4 ++-- plugins/imap-features/imap-headers.c | 3 +-- plugins/mail-notification/mail-notification.c | 3 ++- plugins/mail-to-task/mail-to-task.c | 1 - plugins/mailing-list-actions/mailing-list-actions.c | 4 ++-- 8 files changed, 11 insertions(+), 14 deletions(-) (limited to 'plugins') diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 5e0de2f285..97ddc5b8a2 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index b216d49085..0a7cd1ace5 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -30,12 +30,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -118,7 +118,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) camel_folder_summary_touch (folder->summary); /* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */ uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); - account = mail_config_get_account_by_source_url (uri); + account = e_get_account_by_source_url (uri); uri = account->source->url; em_folder_tree_model_remove_store (model, store); provider = camel_provider_get (uri, NULL); diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 74b67f0ef5..e40771295b 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -524,7 +523,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) } /* This pops-up the password dialog in case the User has forgot-passwords explicitly */ - cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL); + cnc = proxy_login_get_cnc (e_get_account_by_source_url (uri), NULL); if (cnc) g_object_unref (cnc); @@ -535,7 +534,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) e_load_ui_builder_definition (priv->builder, "proxy-login-dialog.ui"); priv->main = e_builder_get_widget (priv->builder, "proxy_login_dialog"); - pld->account = mail_config_get_account_by_source_url (uri); + pld->account = e_get_account_by_source_url (uri); priv->tree = GTK_TREE_VIEW (e_builder_get_widget (priv->builder, "proxy_login_treeview")); priv->store = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 10b0c4c622..61cace9565 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -29,13 +29,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -71,7 +71,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) CamelProvider *provider; uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); - account = mail_config_get_account_by_source_url (uri); + account = e_get_account_by_source_url (uri); if (!account) { return; } diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index ad2757f683..9ec5fb923e 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -95,7 +94,7 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) str = g_string_new(""); - temp = mail_config_get_account_by_source_url (account->source->url); + temp = e_get_account_by_source_url (account->source->url); url = camel_url_new (e_account_get_string (account, E_ACCOUNT_SOURCE_URL), NULL); diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index b83a1bf272..f8fd766cb1 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -490,7 +491,7 @@ new_notify_status (EMEventTargetFolder *t) EAccount *account; gchar *name = t->name; - account = mail_config_get_account_by_source_url (t->uri); + account = e_get_account_by_source_url (t->uri); if (account != NULL) { name = g_strdup_printf ( diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 7f2ee1ea04..794badc969 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 8b123e7d02..fd3ae6c0fa 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -39,9 +39,9 @@ #include "mail/em-utils.h" #include "mail/mail-ops.h" #include "mail/mail-mt.h" -#include "mail/mail-config.h" #include "mail/message-list.h" #include "e-util/e-util.h" +#include "e-util/e-account-utils.h" #include "e-util/e-alert-dialog.h" #include "shell/e-shell-view.h" #include "shell/e-shell-window.h" @@ -181,7 +181,7 @@ emla_list_action_do (CamelFolder *folder, if (send_message_response == GTK_RESPONSE_YES) { /* directly send message */ composer = e_msg_composer_new_from_url (shell, url); - if ((account = mail_config_get_account_by_source_url (action_data->uri))) + if ((account = e_get_account_by_source_url (action_data->uri))) e_composer_header_table_set_account ( e_msg_composer_get_header_table (composer), account); -- cgit v1.2.3