aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-12-18 04:54:43 +0800
committerJonathon Jongsma <jonathon@quotidian.org>2009-12-21 23:45:27 +0800
commitd153638ef6ea99b106fcb9f22c40496f3e75def5 (patch)
treeab3c38051143aea9cd5822e2f8cf58d6e76be11e /mail
parentb887606a6bee18c955f2b4963ebb4b4df4be8b5f (diff)
downloadgsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar.gz
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar.bz2
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar.lz
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar.xz
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.tar.zst
gsoc2013-evolution-d153638ef6ea99b106fcb9f22c40496f3e75def5.zip
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
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-backend.c3
-rw-r--r--mail/mail-session.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 64880ff98f..30b691ef5c 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 2131275216..dc7e40d79a 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);