From 3ca789bf0f8844be4718d2b9b1b9416b334d0424 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 28 Nov 2000 22:59:00 +0000 Subject: Wait until after setting up the local storage to find the * component-factory.c (owner_set_cb): Wait until after setting up the local storage to find the Drafts/Outbox/Sent folders. * mail-ops.c (do_setup_folder): Use the file: store rather than mbox:. svn path=/trunk/; revision=6704 --- mail/component-factory.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index 6b6f16cca4..b1f50f0a96 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -123,13 +123,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, evolution_dir = g_strdup (evolution_homedir); mail_session_init (); - mail_config_init (); - mail_do_setup_folder ("Drafts", &drafts_folder); - mail_do_setup_folder ("Outbox", &outbox_folder); - mail_do_setup_folder ("Sent", &sent_folder); - /* Don't proceed until those _folder variables are valid. */ - mail_operation_wait_for_finish (); create_vfolder_storage (shell_component); @@ -141,6 +135,12 @@ owner_set_cb (EvolutionShellComponent *shell_component, mail_load_storages (corba_shell, sources); mail_local_storage_startup (shell_client, evolution_dir); + + mail_do_setup_folder ("Drafts", &drafts_folder); + mail_do_setup_folder ("Outbox", &outbox_folder); + mail_do_setup_folder ("Sent", &sent_folder); + /* Don't proceed until those _folder variables are valid. */ + mail_operation_wait_for_finish (); } static void -- cgit