[evolution] Move the gross hack for EAccountComboBox up a level

[Jonathon Jongsma <jjongsma src gnome org>]

commit d153638ef6ea99b106fcb9f22c40496f3e75def5
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Thu Dec 17 14:54:43 2009 -0600

    Move the gross hack for EAccountComboBox up a level
    
    This hack really needs to be fixed correctly, but I can't think of a good
    solution for now.  So at the very least, move the hack up a level where it won't
    cause dependency problems for the mail-to-eds split.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=604952

 mail/e-mail-backend.c |    3 +++
 mail/mail-session.c   |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 64880ff..30b691e 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -29,6 +29,8 @@
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 
+#include "misc/e-account-combo-box.h"
+
 #include "shell/e-shell.h"
 
 #include "mail/e-mail-local.h"
@@ -385,6 +387,7 @@ mail_backend_constructed (GObject *object)
 
 	/* This also initializes Camel, so it needs to happen early. */
 	mail_session_init (shell_backend);
+	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
 
 	folder_cache = mail_folder_cache_get_default ();
 
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 2131275..dc7e40d 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -49,7 +49,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
-#include "misc/e-account-combo-box.h"
 #include "shell/e-shell.h"
 
 #include "em-composer-utils.h"
@@ -812,7 +811,6 @@ mail_session_init (EShellBackend *shell_backend)
 	camel_provider_init();
 
 	session = CAMEL_SESSION (camel_object_new (MAIL_SESSION_TYPE));
-	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
 	e_account_writable(NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); /* Init the EAccount Setup */
 
 	mail_data_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL);