From e0f414941dd4e13ea074996d10606b0dae7e494b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Jan 2009 22:18:58 +0000 Subject: Split EAccountList and ESignatureList management out of the mail module. This reduces the dependency of the composer on the mail module, which is currently a circular dependency. svn path=/branches/kill-bonobo/; revision=37135 --- mail/mail-send-recv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 1a8fb02017..6e2ace004b 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -45,7 +45,9 @@ #include "mail-send-recv.h" #include "mail-folder-cache.h" #include "em-event.h" -#include + +#include "e-util/e-account-utils.h" +#include "e-util/gconf-bridge.h" #include "e-mail-shell-module.h" @@ -931,11 +933,11 @@ mail_send_receive (GtkWindow *parent) if (!camel_session_is_online (session)) return send_recv_dialog; - account = mail_config_get_default_account (); + account = e_get_default_account (); if (!account || !account->transport->url) return send_recv_dialog; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); outbox_folder = e_mail_shell_module_get_folder ( mail_shell_module, E_MAIL_FOLDER_OUTBOX); @@ -1076,7 +1078,7 @@ auto_online(CamelObject *o, void *ed, void *d) if (!GPOINTER_TO_INT(ed)) return; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter)) { info = g_object_get_data((GObject *)e_iterator_get(iter), "mail-autoreceive"); if (info && info->timeout_id) @@ -1095,7 +1097,7 @@ mail_autoreceive_init (CamelSession *session) if (auto_active) return; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); auto_active = g_hash_table_new(g_str_hash, g_str_equal); g_signal_connect(accounts, "account-added", G_CALLBACK(auto_account_added), NULL); -- cgit